Merge "Checks null SimData before calling keyguard callback onSimStateChanged." into s-keystone-qcom-dev

1 files changed, 3 insertions, 0 deletions

diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java b/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java
index 33af16464965..1f803aa97948 100755
--- a/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java
+++ b/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java
@@ -508,6 +508,9 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab
 
         for (int i = 0; i < changedSubscriptions.size(); i++) {
             SimData data = mSimDatas.get(changedSubscriptions.get(i).getSimSlotIndex());
+            if (data == null) {
+                continue;
+            }
             for (int j = 0; j < mCallbacks.size(); j++) {
                 KeyguardUpdateMonitorCallback cb = mCallbacks.get(j).get();
                 if (cb != null) {