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

Commit 87a33684 authored by Pengquan Meng's avatar Pengquan Meng Committed by Gerrit Code Review
Browse files

Merge "Fix getSimOperator to return mccmnc based on subId"

parents c173c93c 3c849d26

telephony/java/android/telephony/TelephonyManager.java

+7 −4
Original line number Diff line number Diff line
@@ -2133,7 +2133,9 @@ public class TelephonyManager { 
     * @hide

     */

    public String getSimOperatorNumeric() {

        int subId = SubscriptionManager.getDefaultDataSubscriptionId();

        int subId = mSubId;

        if (!SubscriptionManager.isUsableSubIdValue(subId)) {

            subId = SubscriptionManager.getDefaultDataSubscriptionId();

            if (!SubscriptionManager.isUsableSubIdValue(subId)) {

                subId = SubscriptionManager.getDefaultSmsSubscriptionId();

                if (!SubscriptionManager.isUsableSubIdValue(subId)) {
@@ -2143,6 +2145,7 @@ public class TelephonyManager { 
                    }

                }

            }

        }

        return getSimOperatorNumeric(subId);

    }