commit 9ca3b7a22fba08c3c1317472d6e1a1645eb2fd60
author Eric Laurent <elaurent@google.com> Thu Apr 07 16:06:06 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Apr 07 16:06:06 2016 +0000
tree 1a95527863589e67760d7ae8552d77b3b537911a
parent 85f1c3c5dee946ea522ff4a4f27dfeb700401a69
parent 1e98fbe5075571c1a02808002bb7b9af9fed1df5

Merge "Add the conditions that determine the region for US, CA and JP"

media/libmedia/ToneGenerator.cpp

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;