commit ec89863adec09dbf980b2d2c90c0fa5e78ffa7a9
author Stuart Scott <stuartscott@google.com> Mon Sep 29 21:11:50 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Mon Sep 29 21:11:50 2014 +0000
tree acae1089c02ed2104cb02bc93c8c4532a15bcd7c
parent 4b1cfef5e23ed28790f669fc39679435fd003947
parent 38bfcb4affb234ca901912155d41ec06dce4f43a

am 38bfcb4a: Merge "Get the MCC/MNC using defaults." into lmp-sprout-dev

* commit '38bfcb4affb234ca901912155d41ec06dce4f43a':
  Get the MCC/MNC using defaults.

telephony/java/android/telephony/TelephonyManager.java

diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java
index 869bb90..7173637 100644
--- a/telephony/java/android/telephony/TelephonyManager.java
+++ b/telephony/java/android/telephony/TelephonyManager.java
@@ -1501,7 +1501,16 @@
      * @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);
     }