commit 87c0d297d7d5be67b00834d30b5e6349ae657b88
author Amit Mahajan <amitmahajan@google.com> Wed Jan 14 17:51:37 2015 -0800
committer The Android Automerger <android-build@google.com> Thu Jan 15 14:49:57 2015 -0800
tree 360864e9236d4e5e74be65fed6ee7c3736dac086
parent 1a8c2a47552a90b6f5eca08337d2c28ccdb7d7a4

Change to reset network settings on SIM change instead of IMSI change.

Bug: 19012822
Change-Id: I22403636d36282c6d9a7c7063640051c93afea5b

src/java/com/android/internal/telephony/SubscriptionInfoUpdater.java

diff --git a/src/java/com/android/internal/telephony/SubscriptionInfoUpdater.java b/src/java/com/android/internal/telephony/SubscriptionInfoUpdater.java
index 9ac955d..f805062 100644
--- a/src/java/com/android/internal/telephony/SubscriptionInfoUpdater.java
+++ b/src/java/com/android/internal/telephony/SubscriptionInfoUpdater.java
@@ -84,7 +84,7 @@
     public static final int STATUS_SIM4_INSERTED = 0x08;
 
     // Key used to read/write the current IMSI. Updated on SIM_STATE_CHANGED - LOADED.
-    public static final String CURR_IMSI = "curr_imsi";
+    public static final String CURR_SUBID = "curr_subid";
 
     private static Phone[] mPhone;
     private static Context mContext = null;
@@ -342,15 +342,13 @@
                     + "=" + Long.toString(subId), null);
             logd("carrier name = " + simCarrierName);
 
-            /* Update preferred network type and network selection mode on IMSI change.
-             * Storing last IMSI in SharedPreference for now. Can consider making it
-             * part of subscription info db */
+            /* Update preferred network type and network selection mode on SIM change.
+             * Storing last subId in SharedPreference for now to detect SIM change. */
             SharedPreferences sp =
                     PreferenceManager.getDefaultSharedPreferences(mContext);
-            String storedImsi = sp.getString(CURR_IMSI + slotId, "");
-            String newImsi = mPhone[slotId].getSubscriberId();
+            int storedSubId = sp.getInt(CURR_SUBID + slotId, -1);
 
-            if (!storedImsi.equals(newImsi)) {
+            if (storedSubId != subId) {
                 int networkType = RILConstants.PREFERRED_NETWORK_MODE;
 
                 // Set the modem network mode
@@ -359,13 +357,13 @@
                         Settings.Global.PREFERRED_NETWORK_MODE + mPhone[slotId].getSubId(),
                         networkType);
 
-                // Only support automatic selection mode on IMSI change.
+                // Only support automatic selection mode on SIM change.
                 mPhone[slotId].getNetworkSelectionMode(
                         obtainMessage(EVENT_GET_NETWORK_SELECTION_MODE_DONE, new Integer(slotId)));
 
-                // Update stored IMSI
+                // Update stored subId
                 SharedPreferences.Editor editor = sp.edit();
-                editor.putString(CURR_IMSI + slotId, newImsi);
+                editor.putInt(CURR_SUBID + slotId, subId);
                 editor.apply();
             }
         } else {