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

Commit aa6043a3 authored by richard chou's avatar richard chou Committed by android-build-merger
Browse files

Merge "Reset SIM state if the subscription/slot is no longer active." into pi-dev am: f6840a17 

am: e7e1f443

Change-Id: Ibe760e8622179c16b1311c05ccc659f194af789e
parents 8dffe42c e7e1f443

packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java

+6 −1
Original line number Diff line number Diff line
@@ -1850,6 +1850,7 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener { 
        final TelephonyManager tele = TelephonyManager.from(mContext);

        ArrayList<Integer> changedSubscriptionIds = new ArrayList<>();

        HashSet<Integer> activeSubIds = new HashSet<>();

        HashSet<Integer> activeSlotIds = new HashSet<>();



        for (SubscriptionInfo info : activeSubscriptionInfos) {

            int subId = info.getSubscriptionId();
@@ -1878,11 +1879,15 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener { 
            }



            activeSubIds.add(subId);

            activeSlotIds.add(slotId);

        }



        for (SimData data : mSimDatas.values()) {

            if (!activeSubIds.contains(data.subId) && data.simState != State.ABSENT) {

            if (!activeSubIds.contains(data.subId)

                && !activeSlotIds.contains(data.slotId)

                && data.simState != State.ABSENT) {

                // for the inactive subscriptions, reset state to ABSENT

                if (DEBUG_SIM_STATES) Log.d(TAG, "reset state to ABSENT for subId:" + data.subId);

                data.simState = State.ABSENT;

                changedSubscriptionIds.add(data.subId);

            }