commit 50f455fade94062b07d5d8d22cf853e1afe1f558
author The Android Automerger <android-build@google.com> Wed Jan 28 06:10:24 2015 -0800
committer The Android Automerger <android-build@google.com> Wed Jan 28 06:10:24 2015 -0800
tree e8db99d941281378de4d31f3b4a9f10c548b0ee4
parent 09c9e5eb5d8d223b3b3faa29ce8b03f8873d0553
parent fc8df88fbc0dfc9d13b539950003f1de893a5883

merge in lmp-mr1-release history after reset to lmp-mr1-dev

src/com/android/settings/ApnEditor.java

diff --git a/src/com/android/settings/ApnEditor.java b/src/com/android/settings/ApnEditor.java
index 6d88c50..4e14c60 100644
--- a/src/com/android/settings/ApnEditor.java
+++ b/src/com/android/settings/ApnEditor.java
@@ -34,6 +34,7 @@
 import android.preference.PreferenceActivity;
 import android.preference.SwitchPreference;
 import android.provider.Telephony;
+import android.telephony.SubscriptionManager;
 import android.telephony.TelephonyManager;
 import android.util.Log;
 import android.view.KeyEvent;
@@ -94,6 +95,7 @@
     private Cursor mCursor;
     private boolean mNewApn;
     private boolean mFirstTime;
+    private int mSubId;
     private Resources mRes;
     private TelephonyManager mTelephonyManager;
 
@@ -191,6 +193,7 @@
 
         final Intent intent = getIntent();
         final String action = intent.getAction();
+        mSubId = intent.getIntExtra("sub_id", SubscriptionManager.INVALID_SUBSCRIPTION_ID);
 
         mFirstTime = icicle == null;
 
@@ -263,8 +266,7 @@
             mMnc.setText(mCursor.getString(MNC_INDEX));
             mApnType.setText(mCursor.getString(TYPE_INDEX));
             if (mNewApn) {
-                String numeric =
-                    SystemProperties.get(TelephonyProperties.PROPERTY_ICC_OPERATOR_NUMERIC);
+                String numeric = mTelephonyManager.getSimOperator(mSubId);
                 // MCC is first 3 chars and then in 2 - 3 chars of MNC
                 if (numeric != null && numeric.length() > 4) {
                     // Country code
@@ -387,8 +389,7 @@
                 if (values[mvnoIndex].equals("SPN")) {
                     mMvnoMatchData.setText(mTelephonyManager.getSimOperatorName());
                 } else if (values[mvnoIndex].equals("IMSI")) {
-                    String numeric =
-                            SystemProperties.get(TelephonyProperties.PROPERTY_ICC_OPERATOR_NUMERIC);
+                    String numeric = mTelephonyManager.getSimOperator(mSubId);
                     mMvnoMatchData.setText(numeric + "x");
                 } else if (values[mvnoIndex].equals("GID")) {
                     mMvnoMatchData.setText(mTelephonyManager.getGroupIdLevel1());

src/com/android/settings/ApnSettings.java

diff --git a/src/com/android/settings/ApnSettings.java b/src/com/android/settings/ApnSettings.java
index 61f741b..670924c 100644
--- a/src/com/android/settings/ApnSettings.java
+++ b/src/com/android/settings/ApnSettings.java
@@ -40,6 +40,7 @@
 import android.preference.PreferenceScreen;
 import android.provider.Telephony;
 import android.telephony.SubscriptionInfo;
+import android.telephony.SubscriptionManager;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.Menu;
@@ -132,7 +133,8 @@
     public void onCreate(Bundle icicle) {
         super.onCreate(icicle);
         final Activity activity = getActivity();
-        final int subId = activity.getIntent().getIntExtra("sub_id", -1);
+        final int subId = activity.getIntent().getIntExtra("sub_id",
+                SubscriptionManager.INVALID_SUBSCRIPTION_ID);
 
         mUm = (UserManager) getSystemService(Context.USER_SERVICE);
 
@@ -287,7 +289,11 @@
     }
 
     private void addNewApn() {
-        startActivity(new Intent(Intent.ACTION_INSERT, Telephony.Carriers.CONTENT_URI));
+        Intent intent = new Intent(Intent.ACTION_INSERT, Telephony.Carriers.CONTENT_URI);
+        int subId = mSubscriptionInfo != null ? mSubscriptionInfo.getSubscriptionId()
+                : SubscriptionManager.INVALID_SUBSCRIPTION_ID;
+        intent.putExtra("sub_id", subId);
+        startActivity(intent);
     }
 
     @Override