commit 375e27d8a9dff087ed6e2e6be3738e708cd423f6
author PauloftheWest <paulofthewest@google.com> Mon Dec 08 08:43:07 2014 -0800
committer PauloftheWest <paulofthewest@google.com> Mon Dec 08 11:05:48 2014 -0800
tree ee76666cf676577a2d2ba8c25cff39e89a0a90fc
parent 1dacd19ea9cb67c80dff1562400a8795afb9247a

Added Multi-SIM capability to Access Point Names

+ ApnSettings is now passed the Subscription id associationed with the
SIM selected.

Bug: 18246837
Change-Id: I199e33abb7bb75ba6832c11721ce688615652de9

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;
                         }