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

Commit 4967e754 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix SIM name in Network Details to show the selected SIM." am: 3bd3f983 

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2181975



Change-Id: Ie48078a7c33f40939b9d49140875ec7a02582ed3
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 04cdd540 3bd3f983

src/com/android/settings/wifi/details2/WifiDetailPreferenceController2.java

+14 −7
Original line number Diff line number Diff line
@@ -713,22 +713,29 @@ public class WifiDetailPreferenceController2 extends AbstractPreferenceControlle 
                .getSystemService(SubscriptionManager.class).getActiveSubscriptionInfoList();

        final int defaultDataSubscriptionId = SubscriptionManager.getDefaultDataSubscriptionId();

        if (activeSubscriptionInfos != null) {

            CharSequence firstCarrierIdMatchedDisplayName = null;

            for (SubscriptionInfo subscriptionInfo : activeSubscriptionInfos) {

                final CharSequence displayName = SubscriptionUtil.getUniqueSubscriptionDisplayName(

                        subscriptionInfo, mContext);

                if (config.carrierId == subscriptionInfo.getCarrierId()) {

                    mEapSimSubscriptionPref.setSummary(displayName);

                    return;

                if (firstCarrierIdMatchedDisplayName == null

                        && config.carrierId == subscriptionInfo.getCarrierId()) {

                    firstCarrierIdMatchedDisplayName = displayName;

                }



                // When it's UNKNOWN_CARRIER_ID, devices connects it with the SIM subscription of

                // defaultDataSubscriptionId.

                if (config.carrierId == TelephonyManager.UNKNOWN_CARRIER_ID

                        && defaultDataSubscriptionId == subscriptionInfo.getSubscriptionId()) {

                // When it's UNKNOWN_CARRIER_ID or matched with configured CarrierId,

                // devices connects it with the SIM subscription of defaultDataSubscriptionId.

                if (defaultDataSubscriptionId == subscriptionInfo.getSubscriptionId()

                        && (config.carrierId == subscriptionInfo.getCarrierId()

                                || config.carrierId == TelephonyManager.UNKNOWN_CARRIER_ID)) {

                    mEapSimSubscriptionPref.setSummary(displayName);

                    return;

                }

            }



            if (firstCarrierIdMatchedDisplayName != null) {

                mEapSimSubscriptionPref.setSummary(firstCarrierIdMatchedDisplayName);

                return;

            }

        }



        if (config.carrierId == TelephonyManager.UNKNOWN_CARRIER_ID) {