commit 7a9c55c5cedf46ef4f6b3de034634312bd1ff0ee
author tadashi.aoyama <tadashi.xa.aoyama@sonymobile.com> Mon Apr 18 18:30:46 2016 +0900
committer Eric Laurent <elaurent@google.com> Thu Jun 30 18:06:32 2016 -0700
tree 012a19a73ae8616b2a49c81e3cb1e32dcf1a263f
parent 3743febf9567e849ce580ddc68579237d96e5a55

Fix tone region(for US, CA and JP) recognition for dual SIM

Value of "gsm.operator.iso-country" differs between the case of single
SIM device and the case of dual SIM device with only one SIM enabled.
This change makes ToneGenerator detect region in case there is only
one SIM enabled in dual SIM device.

Change-Id: I771858ec9d85054d90d7d8141266655b42b093b9

media/libmedia/ToneGenerator.cpp

diff --git a/media/libmedia/ToneGenerator.cpp b/media/libmedia/ToneGenerator.cpp
index 0928bdc..8791a45 100644
--- a/media/libmedia/ToneGenerator.cpp
+++ b/media/libmedia/ToneGenerator.cpp
@@ -832,16 +832,12 @@
 
     char value[PROPERTY_VALUE_MAX];
     property_get("gsm.operator.iso-country", value, "");
-    if (strcmp(value,"us") == 0 ||
-        strcmp(value,"us,us") == 0 ||
-        strcmp(value,"ca") == 0 ||
-        strcmp(value,"ca,ca") == 0) {
+    if (strstr(value, "us") != NULL ||
+        strstr(value, "ca") != NULL) {
         mRegion = ANSI;
-    } else if (strcmp(value,"jp") == 0 ||
-               strcmp(value,"jp,jp") == 0) {
+    } else if (strstr(value, "jp") != NULL) {
         mRegion = JAPAN;
-    } else if (strcmp(value,"uk") == 0 ||
-               strcmp(value,"uk,uk") == 0) {
+    } else if (strstr(value, "uk") != NULL) {
         mRegion = UK;
     } else {
         mRegion = CEPT;