commit cfbaedf0096719fa3f43bec94a9bb2e0d18da582
author Eino-Ville Talvala <etalvala@google.com> Tue Jun 21 17:39:29 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jun 21 17:39:29 2016 +0000
tree 405677eb1a62b7c2e0308a8c56d7ab60f2b996c8
parent e3596517c1df94158e47b5ecc41dc0ac09091943
parent 6d7af0e93c8442f98b3f3683a3e03d9b4b9856db

Merge "Add support for streams with vendor specific formats"

media/libmedia/ToneGenerator.cpp

diff --git a/media/libmedia/ToneGenerator.cpp b/media/libmedia/ToneGenerator.cpp
index 752c9a4..8add2b8 100644
--- a/media/libmedia/ToneGenerator.cpp
+++ b/media/libmedia/ToneGenerator.cpp
@@ -813,7 +813,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;