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

Commit b7a33702 authored by Pengquan Meng's avatar Pengquan Meng Committed by android-build-merger
Browse files

Merge "Fix getSimOperator to return mccmnc based on subId" am: 87a33684 am: 44dc1167 

am: 402f6431

Change-Id: I7fdec39374578ca2c3ca0d34b50d32842cf7efc0
parents 7930c4f1 402f6431

telephony/java/android/telephony/TelephonyManager.java

+7 −4
Original line number Diff line number Diff line
@@ -2166,7 +2166,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)) {
@@ -2176,6 +2178,7 @@ public class TelephonyManager { 
                    }

                }

            }

        }

        return getSimOperatorNumeric(subId);

    }