commit 0e84c154438fac17e2a60b90c6adab7348fcc7b2
author Eric Laurent <elaurent@google.com> Fri Jul 01 16:26:36 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jul 01 16:26:36 2016 +0000
tree 858e1423cf74fcdfc2c8e7aaa6962cde520b61de
parent c9a7b558434b0c266dd095f786ca0a14c5a1f24a
parent 7a9c55c5cedf46ef4f6b3de034634312bd1ff0ee

Merge "Fix tone region(for US, CA and JP) recognition for dual SIM" into nyc-mr1-dev

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;