Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ec89863a authored by Stuart Scott's avatar Stuart Scott Committed by Android Git Automerger
Browse files

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

* commit '38bfcb4a':
  Get the MCC/MNC using defaults.
parents 4b1cfef5 38bfcb4a

telephony/java/android/telephony/TelephonyManager.java

+10 −1
Original line number Diff line number Diff line
@@ -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);

    }