commit b4c29ee65031396bf2717bf140edd5cbfc22c474
author PauloftheWest <paulofthewest@google.com> Tue Dec 09 23:27:20 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Dec 09 23:27:21 2014 +0000
tree 3c60c63f4f17f0b04feb5db712f69572dcc28104
parent 528a7ffd962f3c34d1792157de2279f43eaf8a31
parent 375e27d8a9dff087ed6e2e6be3738e708cd423f6

Merge "Added Multi-SIM capability to Access Point Names" into lmp-mr1-dev

src/com/android/phone/GsmUmtsOptions.java

diff --git a/src/com/android/phone/GsmUmtsOptions.java b/src/com/android/phone/GsmUmtsOptions.java
index 8964cb5..ee6a738 100644
--- a/src/com/android/phone/GsmUmtsOptions.java
+++ b/src/com/android/phone/GsmUmtsOptions.java
@@ -40,10 +40,13 @@
     private static final String BUTTON_CARRIER_SETTINGS_KEY = "carrier_settings_key";
     private PreferenceActivity mPrefActivity;
     private PreferenceScreen mPrefScreen;
+    private int mSubId;
 
-    public GsmUmtsOptions(PreferenceActivity prefActivity, PreferenceScreen prefScreen) {
+    public GsmUmtsOptions(PreferenceActivity prefActivity, PreferenceScreen prefScreen,
+            final int subId) {
         mPrefActivity = prefActivity;
         mPrefScreen = prefScreen;
+        mSubId = subId;
         create();
     }
 
@@ -106,6 +109,7 @@
                             final Intent intent = new Intent(Settings.ACTION_APN_SETTINGS);
                             // This will setup the Home and Search affordance
                             intent.putExtra(":settings:show_fragment_as_subsetting", true);
+                            intent.putExtra("sub_id", mSubId);
                             mPrefActivity.startActivity(intent);
                             return true;
                         }

src/com/android/phone/MobileNetworkSettings.java

diff --git a/src/com/android/phone/MobileNetworkSettings.java b/src/com/android/phone/MobileNetworkSettings.java
index 4f57ad7..efb61f6 100644
--- a/src/com/android/phone/MobileNetworkSettings.java
+++ b/src/com/android/phone/MobileNetworkSettings.java
@@ -412,7 +412,7 @@
             mButtonPreferredNetworkMode.setOnPreferenceChangeListener(this);
 
             mCdmaOptions = new CdmaOptions(this, prefSet, mPhone);
-            mGsmUmtsOptions = new GsmUmtsOptions(this, prefSet);
+            mGsmUmtsOptions = new GsmUmtsOptions(this, prefSet, phoneSubId);
         } else {
             prefSet.removePreference(mButtonPreferredNetworkMode);
             final int phoneType = mPhone.getPhoneType();
@@ -488,7 +488,7 @@
                     mButtonEnabledNetworks.setEntryValues(
                             R.array.enabled_networks_values);
                 }
-                mGsmUmtsOptions = new GsmUmtsOptions(this, prefSet);
+                mGsmUmtsOptions = new GsmUmtsOptions(this, prefSet, phoneSubId);
             } else {
                 throw new IllegalStateException("Unexpected phone type: " + phoneType);
             }
@@ -1051,7 +1051,7 @@
         }
 
         if (mGsmUmtsOptions == null) {
-            mGsmUmtsOptions = new GsmUmtsOptions(this, prefSet);
+            mGsmUmtsOptions = new GsmUmtsOptions(this, prefSet, mPhone.getSubId());
         }
         PreferenceScreen apnExpand =
                 (PreferenceScreen) prefSet.findPreference(BUTTON_APN_EXPAND_KEY);