Merge "Fix for NPE in KeyguardUpdateMonitor" into main

Treehugger Robot · Android (Google) Code Review · commit d85ec0169c77 · 2024-08-29T21:31:44.000Z
diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java b/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java
@@ -3811,7 +3811,8 @@ private int getSlotId(int subId) {
         if (!mSimDatas.containsKey(subId)) {
             refreshSimState(subId, SubscriptionManager.getSlotIndex(subId));
         }
-        return mSimDatas.get(subId).slotId;
+        SimData simData = mSimDatas.get(subId);
+        return simData != null ? simData.slotId : SubscriptionManager.INVALID_SUBSCRIPTION_ID;
     }
 
     private final TaskStackChangeListener mTaskStackListener = new TaskStackChangeListener() {

Original file line number	Diff line number	Diff line change
`@@ -3811,7 +3811,8 @@ private int getSlotId(int subId) {`
`3811`	`3811`	`if (!mSimDatas.containsKey(subId)) {`
`3812`	`3812`	`refreshSimState(subId, SubscriptionManager.getSlotIndex(subId));`
`3813`	`3813`	`}`
`3814`		`- return mSimDatas.get(subId).slotId;`
	`3814`	`+ SimData simData = mSimDatas.get(subId);`
	`3815`	`+ return simData != null ? simData.slotId : SubscriptionManager.INVALID_SUBSCRIPTION_ID;`
`3815`	`3816`	`}`
`3816`	`3817`
`3817`	`3818`	`private final TaskStackChangeListener mTaskStackListener = new TaskStackChangeListener() {`