commit ccb9fcfa1fa6d19e8d7ce60c592e4338d4a3575c
author Sanket Padawe <sanketpadawe@google.com> Tue Dec 16 03:00:41 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Dec 16 03:00:41 2014 +0000
tree 384c78153c00b32ece0d7deaab90a07b26b0de47
parent 622fe17483874f98b0a2bba56bcc2bfea6f416cd
parent 996724ea6d121bf5aa75f1779fc7337b0fa3f0c9

am 996724ea: am 7131f1a9: Merge "Prevent sim notify popup after upgrade from k to LMR1." into lmp-mr1-dev

* commit '996724ea6d121bf5aa75f1779fc7337b0fa3f0c9':
  Prevent sim notify popup after upgrade from k to LMR1.

src/com/android/settings/sim/SimBootReceiver.java

diff --git a/src/com/android/settings/sim/SimBootReceiver.java b/src/com/android/settings/sim/SimBootReceiver.java
index 3b3489e..4cd1438 100644
--- a/src/com/android/settings/sim/SimBootReceiver.java
+++ b/src/com/android/settings/sim/SimBootReceiver.java
@@ -44,6 +44,7 @@
     private static final int NOTIFICATION_ID = 1;
     private static final String SHARED_PREFERENCES_NAME = "sim_state";
     private static final String SLOT_PREFIX = "sim_slot_";
+    private static final int INVALID_SLOT = -2; // Used when upgrading from K to LMR1
 
     private SharedPreferences mSharedPreferences = null;
     private TelephonyManager mTelephonyManager;
@@ -91,7 +92,9 @@
             if (sir != null) {
                 numSIMsDetected++;
                 final int currentSubId = sir.getSubscriptionId();
-                if (lastSubId != currentSubId) {
+                if (lastSubId == INVALID_SLOT) {
+                    setLastSubId(key, currentSubId);
+                } else if (lastSubId != currentSubId) {
                     createNotification(mContext);
                     setLastSubId(key, currentSubId);
                     notificationSent = true;
@@ -118,7 +121,7 @@
     }
 
     private int getLastSubId(String strSlotId) {
-        return mSharedPreferences.getInt(strSlotId, SLOT_EMPTY);
+        return mSharedPreferences.getInt(strSlotId, INVALID_SLOT);
     }
 
     private void setLastSubId(String strSlotId, int value) {