PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit '996724ea6d121bf5aa75f1779fc7337b0fa3f0c9':
  Prevent sim notify popup after upgrade from k to LMR1.
This commit is contained in:
Sanket Padawe
2014-12-16 03:00:41 +00:00
committed by Android Git Automerger
parent 622fe17483 996724ea6d
commit ccb9fcfa1f
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/com/android/settings/sim/SimBootReceiver.java
View File

@@ -44,6 +44,7 @@ public class SimBootReceiver extends BroadcastReceiver {
private static final int NOTIFICATION_ID = 1; private static final int NOTIFICATION_ID = 1;
private static final String SHARED_PREFERENCES_NAME = "sim_state"; private static final String SHARED_PREFERENCES_NAME = "sim_state";
private static final String SLOT_PREFIX = "sim_slot_"; 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 SharedPreferences mSharedPreferences = null;
private TelephonyManager mTelephonyManager; private TelephonyManager mTelephonyManager;
@@ -91,7 +92,9 @@ public class SimBootReceiver extends BroadcastReceiver {
if (sir != null) { if (sir != null) {
numSIMsDetected++; numSIMsDetected++;
final int currentSubId = sir.getSubscriptionId(); final int currentSubId = sir.getSubscriptionId();
if (lastSubId != currentSubId) { if (lastSubId == INVALID_SLOT) {
setLastSubId(key, currentSubId);
} else if (lastSubId != currentSubId) {
createNotification(mContext); createNotification(mContext);
setLastSubId(key, currentSubId); setLastSubId(key, currentSubId);
notificationSent = true; notificationSent = true;
@@ -118,7 +121,7 @@ public class SimBootReceiver extends BroadcastReceiver {
} }
private int getLastSubId(String strSlotId) { private int getLastSubId(String strSlotId) {
return mSharedPreferences.getInt(strSlotId, SLOT_EMPTY); return mSharedPreferences.getInt(strSlotId, INVALID_SLOT);
} }
private void setLastSubId(String strSlotId, int value) { private void setLastSubId(String strSlotId, int value) {