Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
TreeHugger Robot
2018-04-25 17:12:20 +00:00
committed by Android (Google) Code Review
parent 6f79bd0019 700dd5c659
commit d60e8836f3
1 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java
View File

@@ -1850,7 +1850,6 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener {
final TelephonyManager tele = TelephonyManager.from(mContext); final TelephonyManager tele = TelephonyManager.from(mContext);
ArrayList<Integer> changedSubscriptionIds = new ArrayList<>(); ArrayList<Integer> changedSubscriptionIds = new ArrayList<>();
HashSet<Integer> activeSubIds = new HashSet<>(); HashSet<Integer> activeSubIds = new HashSet<>();
HashSet<Integer> activeSlotIds = new HashSet<>();
for (SubscriptionInfo info : activeSubscriptionInfos) { for (SubscriptionInfo info : activeSubscriptionInfos) {
int subId = info.getSubscriptionId(); int subId = info.getSubscriptionId();
@@ -1879,15 +1878,11 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener {
} }
activeSubIds.add(subId); activeSubIds.add(subId);
activeSlotIds.add(slotId);
} }
for (SimData data : mSimDatas.values()) { for (SimData data : mSimDatas.values()) {
if (!activeSubIds.contains(data.subId) if (!activeSubIds.contains(data.subId) && data.simState != State.ABSENT) {
&& !activeSlotIds.contains(data.slotId)
&& data.simState != State.ABSENT) {
// for the inactive subscriptions, reset state to 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; data.simState = State.ABSENT;
changedSubscriptionIds.add(data.subId); changedSubscriptionIds.add(data.subId);
} }