From 700dd5c65995b724db11b96253ea840cdaa17cb8 Mon Sep 17 00:00:00 2001 From: Richard Chou Date: Mon, 23 Apr 2018 03:40:05 +0000 Subject: [PATCH] Revert "Reset SIM state if the subscription/slot is no longer active." This reverts commit 3e7c7ca8e4faed7d0377258ec1fdd43e07083316. Reason for revert: This commit will cause side effects with Project Fi. It'd be too risky to solve this issue at the current stage of Android P. Revert first. Bug: 77579824 Bug: 77702165 Change-Id: I404cd5b4413ba95a26aabb5da55c565a37f06e7e --- .../src/com/android/keyguard/KeyguardUpdateMonitor.java | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java b/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java index c826aaaac7490..1bab36be8cd83 100644 --- a/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java +++ b/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java @@ -1850,7 +1850,6 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener { final TelephonyManager tele = TelephonyManager.from(mContext); ArrayList changedSubscriptionIds = new ArrayList<>(); HashSet activeSubIds = new HashSet<>(); - HashSet activeSlotIds = new HashSet<>(); for (SubscriptionInfo info : activeSubscriptionInfos) { int subId = info.getSubscriptionId(); @@ -1879,15 +1878,11 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener { } activeSubIds.add(subId); - activeSlotIds.add(slotId); } for (SimData data : mSimDatas.values()) { - if (!activeSubIds.contains(data.subId) - && !activeSlotIds.contains(data.slotId) - && data.simState != State.ABSENT) { + if (!activeSubIds.contains(data.subId) && 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); }