am 0a1eb640: Merge "Carrier text handle sim removal" into lmp-mr1-dev

* commit '0a1eb640d29830813bb478b8635763a708b6310c': Carrier text handle sim removal
2015-01-12 21:06:46 +00:00
parent 4212bf1fad 0a1eb640d2
commit a50a66824c
1 changed files with 6 additions and 1 deletions
--- a/packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java
+++ b/packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java
@@ -284,10 +284,15 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener {
                KeyguardUpdateMonitorCallback cb = mCallbacks.get(j).get();
                if (cb != null) {
                    cb.onSimStateChanged(data.subId, data.slotId, data.simState);
-                    cb.onRefreshCarrierInfo();
                }
            }
        }
+        for (int j = 0; j < mCallbacks.size(); j++) {
+            KeyguardUpdateMonitorCallback cb = mCallbacks.get(j).get();
+            if (cb != null) {
+                cb.onRefreshCarrierInfo();
+            }
+        }
    }

    /** @return List of SubscriptionInfo records, maybe empty but never null */