commit 832f37ea5f0b8c697c39c7a2a88eb770f39c8458
author Sindhu Kanathur <skanat@codeaurora.org> Wed Sep 10 16:14:52 2014 +0530
committer Linux Build Service Account <lnxbuild@localhost> Tue Nov 04 08:33:16 2014 -0700
tree f88982411a64ffc8c360f6391cd286569f22cce7
parent 4f28ccb3cc7386c3b9ff2d5b51ae6d07d792c540

Fix for maintaining proper simState across subscriptions

Change the condition to update the subscription
information based on slot Id once the subInfoRecords are loaded.
Update the subscription information and the sim state based on
the previously stored subscription information rather than
invalid subscription.

Change-Id: Ia31784781d6e7f6a82665c40cd10cb557fe6b018
CRs-Fixed: 721525

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

diff --git a/packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java b/packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java
index 751e239..3a5fafa 100644
--- a/packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java
+++ b/packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java
@@ -635,7 +635,7 @@
             for (SubInfoRecord subInfo: activeSubInfos) {
                 //subId for the slot initially initiazed to invalid value
                 //Got intent with correct subId for the slot now.
-                if (mSubIdForSlot[subInfo.mSlotId] == INVALID_SUBID) {
+                if (mSubIdForSlot[subInfo.mSlotId] != subInfo.mSubId) {
                     long subId = mSubIdForSlot[subInfo.mSlotId];
                     mSimState.put(subInfo.mSubId, mSimState.get(subId));
                     mPlmn.put(subInfo.mSubId, mPlmn.get(subId));