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

Commit 015f3b46 authored by Stuart Scott's avatar Stuart Scott
Browse files

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
parent df44f764

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);

    }