From 015f3b464c42421ade3ce508d9412b217ba2c23d Mon Sep 17 00:00:00 2001
From: Stuart Scott <stuartscott@google.com>
Date: Fri, 26 Sep 2014 21:46:39 -0700
Subject: [PATCH] Get the MCC/MNC using defaults.

First try default data, then default sms, then default voice, finally
try the first sub to come up.

bug: 17396869
Change-Id: I09da19b7b25c2a6aa8affd95847dbb10e039f634
---
 .../java/android/telephony/TelephonyManager.java      | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java
index 63fb3b7596d47..b72a920bed297 100644
--- a/telephony/java/android/telephony/TelephonyManager.java
+++ b/telephony/java/android/telephony/TelephonyManager.java
@@ -1501,7 +1501,16 @@ public class TelephonyManager {
      * @see #getSimState
      */
     public String getSimOperator() {
-        long subId = getDefaultSubscription();
+        long subId = SubscriptionManager.getDefaultDataSubId();
+        if (!SubscriptionManager.isUsableSubIdValue(subId)) {
+            subId = SubscriptionManager.getDefaultSmsSubId();
+            if (!SubscriptionManager.isUsableSubIdValue(subId)) {
+                subId = SubscriptionManager.getDefaultVoiceSubId();
+                if (!SubscriptionManager.isUsableSubIdValue(subId)) {
+                    subId = SubscriptionManager.getDefaultSubId();
+                }
+            }
+        }
         Rlog.d(TAG, "getSimOperator(): default subId=" + subId);
         return getSimOperator(subId);
     }