Merge "ToneGenerator: fix dual sim ringback tone" am: 85e8823fc7 am: fe08c18918

am: 831da6ee4c

Change-Id: Iea171fc613f8449a88593dcb4c07e63d57b586a6

media/libaudioclient/ToneGenerator.cpp

@@ -864,6 +864,13 @@ ToneGenerator::ToneGenerator(audio_stream_type_t streamType, float volume, bool
     if (property_get("gsm.operator.iso-country", value, "") == 0) {
         property_get("gsm.sim.operator.iso-country", value, "");
     }
+    // If dual sim device has two SIM cards inserted and is not registerd to any network,
+    // "," is set to "gsm.operator.iso-country" prop.
+    // In this case, "gsm.sim.operator.iso-country" prop should be used.
+    if (strlen(value) == 1 && strstr(value, ",") != NULL) {
+        property_get("gsm.sim.operator.iso-country", value, "");
+    }
+
     if (strstr(value, "us") != NULL ||
         strstr(value, "ca") != NULL) {
         mRegion = ANSI;