Add the conditions that determine the region for US, CA and JP
Region is incorrect when dual SIM is inserted.
ToneGenerator class doesn't consider the dual SIM use case,
so region is always set to a default value(CEPT) even if
these country's dual SIMs are inserted.
Change-Id: Iad684856f550b50345b71d8c07e99e27f87407a7
diff --git a/media/libmedia/ToneGenerator.cpp b/media/libmedia/ToneGenerator.cpp
index 411519d..0928bdc 100644
--- a/media/libmedia/ToneGenerator.cpp
+++ b/media/libmedia/ToneGenerator.cpp
@@ -833,9 +833,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 if (strcmp(value,"uk") == 0 ||
strcmp(value,"uk,uk") == 0) {