commit 1e98fbe5075571c1a02808002bb7b9af9fed1df5
author takafumi nakamura <takafumi.x.nakamura@sonymobile.com> Fri Nov 20 18:09:02 2015 +0900
committer Zoran Jovanovic <zoran.jovanovic@sonymobile.com> Thu Mar 31 13:26:49 2016 +0200
tree d5db4cffbb5b9e0937d407b8202f54e45d1fb0d3
parent bf1e74ed393c8282e7e673e0b150df8905ebdfaf

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

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;