Merge "Add the conditions that determine the region for US, CA and JP"
diff --git a/media/libmedia/ToneGenerator.cpp b/media/libmedia/ToneGenerator.cpp
index 9f4b4de..7e24aaf 100644
--- a/media/libmedia/ToneGenerator.cpp
+++ b/media/libmedia/ToneGenerator.cpp
@@ -815,9 +815,12 @@
char value[PROPERTY_VALUE_MAX];
property_get("gsm.operator.iso-country", value, "");
if (strcmp(value,"us") == 0 ||
- strcmp(value,"ca") == 0) {
+ strcmp(value,"us,us") == 0 ||
+ strcmp(value,"ca") == 0 ||
+ strcmp(value,"ca,ca") == 0) {
mRegion = ANSI;
- } else if (strcmp(value,"jp") == 0) {
+ } else if (strcmp(value,"jp") == 0 ||
+ strcmp(value,"jp,jp") == 0) {
mRegion = JAPAN;
} else {
mRegion = CEPT;