commit 9a6338cd2d894359705184cb24c04f8e900878f7
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Thu Aug 29 21:31:44 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Aug 29 21:31:44 2024 +0000
tree 279214837e88ffaf59929853a72aa851ba40a6cb
parent d3a5b9b3938799c02334c842556a78e736ea4b13
parent 9c8106e1352d0f361b7e7878f36a1fffbd0e30a4

Merge "Fix for NPE in KeyguardUpdateMonitor" into main

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

diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java b/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java
index 9b45fa4..f731186 100644
--- a/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java
+++ b/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java
@@ -3811,7 +3811,8 @@
         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() {