commit 0664aa0b813ce1fe9db157c3226bf142a5a2c1ce
author Eric Laurent <elaurent@google.com> Fri Jul 01 16:26:44 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jul 01 16:26:44 2016 +0000
tree b3fde7b7c57411249c8dbb2538e6b3e17da44540
parent 0e84c154438fac17e2a60b90c6adab7348fcc7b2
parent 1bcae276ab189c364393d6971ed8a7d5e6376498

Merge "Fix for wrong ringtone when using VoWiFi" into nyc-mr1-dev

media/libmedia/ToneGenerator.cpp

diff --git a/media/libmedia/ToneGenerator.cpp b/media/libmedia/ToneGenerator.cpp
index 8791a45..34445e0 100644
--- a/media/libmedia/ToneGenerator.cpp
+++ b/media/libmedia/ToneGenerator.cpp
@@ -831,7 +831,9 @@
     mProcessSize = (mSamplingRate * 20) / 1000;
 
     char value[PROPERTY_VALUE_MAX];
-    property_get("gsm.operator.iso-country", value, "");
+    if (property_get("gsm.operator.iso-country", value, "") == 0) {
+        property_get("gsm.sim.operator.iso-country", value, "");
+    }
     if (strstr(value, "us") != NULL ||
         strstr(value, "ca") != NULL) {
         mRegion = ANSI;