diff options
| -rwxr-xr-x | packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java | 28 | ||||
| -rw-r--r-- | packages/SystemUI/tests/src/com/android/keyguard/KeyguardUpdateMonitorTest.java | 22 |
2 files changed, 1 insertions, 49 deletions
diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java b/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java index 84accf809abe..9e390e6bd3f4 100755 --- a/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java +++ b/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java @@ -124,13 +124,10 @@ import java.util.ArrayDeque; import java.util.ArrayList; import java.util.Date; import java.util.HashMap; -import java.util.HashSet; -import java.util.Iterator; import java.util.List; import java.util.Locale; import java.util.Map; import java.util.Map.Entry; -import java.util.Set; import java.util.TimeZone; import java.util.concurrent.Executor; import java.util.function.Consumer; @@ -473,39 +470,16 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab List<SubscriptionInfo> subscriptionInfos = getSubscriptionInfo(true /* forceReload */); // Hack level over 9000: Because the subscription id is not yet valid when we see the - // first update in handleSimStateChange, we need to force refresh all SIM states + // first update in handleSimStateChange, we need to force refresh all all SIM states // so the subscription id for them is consistent. ArrayList<SubscriptionInfo> changedSubscriptions = new ArrayList<>(); - Set<Integer> activeSubIds = new HashSet<>(); for (int i = 0; i < subscriptionInfos.size(); i++) { SubscriptionInfo info = subscriptionInfos.get(i); - activeSubIds.add(info.getSubscriptionId()); boolean changed = refreshSimState(info.getSubscriptionId(), info.getSimSlotIndex()); if (changed) { changedSubscriptions.add(info); } } - - // It is possible for active subscriptions to become invalid (-1), and these will not be - // present in the subscriptionInfo list - Iterator<Map.Entry<Integer, SimData>> iter = mSimDatas.entrySet().iterator(); - while (iter.hasNext()) { - Map.Entry<Integer, SimData> simData = iter.next(); - if (!activeSubIds.contains(simData.getKey())) { - Log.i(TAG, "Previously active sub id " + simData.getKey() + " is now invalid, " - + "will remove"); - iter.remove(); - - SimData data = simData.getValue(); - for (int j = 0; j < mCallbacks.size(); j++) { - KeyguardUpdateMonitorCallback cb = mCallbacks.get(j).get(); - if (cb != null) { - cb.onSimStateChanged(data.subId, data.slotId, data.simState); - } - } - } - } - for (int i = 0; i < changedSubscriptions.size(); i++) { SimData data = mSimDatas.get(changedSubscriptions.get(i).getSimSlotIndex()); if (data == null) { diff --git a/packages/SystemUI/tests/src/com/android/keyguard/KeyguardUpdateMonitorTest.java b/packages/SystemUI/tests/src/com/android/keyguard/KeyguardUpdateMonitorTest.java index ec4dfba87af0..cd07888d2c41 100644 --- a/packages/SystemUI/tests/src/com/android/keyguard/KeyguardUpdateMonitorTest.java +++ b/packages/SystemUI/tests/src/com/android/keyguard/KeyguardUpdateMonitorTest.java @@ -760,28 +760,6 @@ public class KeyguardUpdateMonitorTest extends SysuiTestCase { } @Test - public void testActiveSubscriptionBecomesInactive() { - List<SubscriptionInfo> list = new ArrayList<>(); - list.add(TEST_SUBSCRIPTION); - when(mSubscriptionManager.getCompleteActiveSubscriptionInfoList()).thenReturn(list); - mKeyguardUpdateMonitor.mPhoneStateListener.onActiveDataSubscriptionIdChanged( - TEST_SUBSCRIPTION.getSubscriptionId()); - mTestableLooper.processAllMessages(); - assertThat(mKeyguardUpdateMonitor.mSimDatas.get(TEST_SUBSCRIPTION.getSubscriptionId())) - .isNotNull(); - - when(mSubscriptionManager.getCompleteActiveSubscriptionInfoList()).thenReturn(null); - mKeyguardUpdateMonitor.mPhoneStateListener.onActiveDataSubscriptionIdChanged( - SubscriptionManager.INVALID_SUBSCRIPTION_ID); - mTestableLooper.processAllMessages(); - - assertThat(mKeyguardUpdateMonitor.mSimDatas.get(TEST_SUBSCRIPTION.getSubscriptionId())) - .isNull(); - assertThat(mKeyguardUpdateMonitor.mSimDatas.get( - SubscriptionManager.INVALID_SUBSCRIPTION_ID)).isNull(); - } - - @Test public void testIsUserUnlocked() { // mUserManager will report the user as unlocked on @Before assertThat(mKeyguardUpdateMonitor.isUserUnlocked(KeyguardUpdateMonitor.getCurrentUser())) |