diff options
| author | Sanket Padawe <sanketpadawe@google.com> | 2014-12-16 02:42:28 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-12-16 02:42:29 +0000 |
| commit | 7131f1a99cd87d452a1ab915333d7b1dbdfb9114 (patch) | |
| tree | 2eec6682a36d6a39e27510488e647245a3e7b888 /src/com/android/settings/sim | |
| parent | d059127659048d9f26a79e22728068c709e2d831 (diff) | |
| parent | 9b566a09244a2d528175281b588892ef14719e80 (diff) | |
| download | packages_apps_Settings-7131f1a99cd87d452a1ab915333d7b1dbdfb9114.zip packages_apps_Settings-7131f1a99cd87d452a1ab915333d7b1dbdfb9114.tar.gz packages_apps_Settings-7131f1a99cd87d452a1ab915333d7b1dbdfb9114.tar.bz2 | |
Merge "Prevent sim notify popup after upgrade from k to LMR1." into lmp-mr1-dev
Diffstat (limited to 'src/com/android/settings/sim')
| -rw-r--r-- | src/com/android/settings/sim/SimBootReceiver.java | 7 |
1 files changed, 5 insertions, 2 deletions
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 @@ public class SimBootReceiver extends BroadcastReceiver { 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 @@ public class SimBootReceiver extends BroadcastReceiver { 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 @@ public class SimBootReceiver extends BroadcastReceiver { } private int getLastSubId(String strSlotId) { - return mSharedPreferences.getInt(strSlotId, SLOT_EMPTY); + return mSharedPreferences.getInt(strSlotId, INVALID_SLOT); } private void setLastSubId(String strSlotId, int value) { |