diff options
author | PauloftheWest <paulofthewest@google.com> | 2014-12-02 08:45:00 -0800 |
---|---|---|
committer | PauloftheWest <paulofthewest@google.com> | 2014-12-08 10:48:20 -0800 |
commit | 6f341b2c3ecede3ea19d59300b1a6dc9643f28d5 (patch) | |
tree | f16fc36ebbed9f3964ca6bcc43e96ad75fe178e0 /src/com/android/settings/ApnSettings.java | |
parent | 838d6dc94970201792bc825091c9b520fb96821a (diff) | |
download | packages_apps_Settings-6f341b2c3ecede3ea19d59300b1a6dc9643f28d5.zip packages_apps_Settings-6f341b2c3ecede3ea19d59300b1a6dc9643f28d5.tar.gz packages_apps_Settings-6f341b2c3ecede3ea19d59300b1a6dc9643f28d5.tar.bz2 |
Added Multi-SIM capability to Access Point Names
+ In Settings->More->Cellular networks->AccessPoint Names will display
the APNs for the selected SubscriptionInfo.
Bug: 18246837
Change-Id: If8f46c2fa82cf4b2051ddb5f15afc8c59cb9b850
Diffstat (limited to 'src/com/android/settings/ApnSettings.java')
-rw-r--r-- | src/com/android/settings/ApnSettings.java | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/src/com/android/settings/ApnSettings.java b/src/com/android/settings/ApnSettings.java index 0c0e53c..db5449f 100644 --- a/src/com/android/settings/ApnSettings.java +++ b/src/com/android/settings/ApnSettings.java @@ -39,6 +39,7 @@ import android.preference.PreferenceActivity; import android.preference.PreferenceGroup; import android.preference.PreferenceScreen; import android.provider.Telephony; +import android.telephony.SubscriptionInfo; import android.util.Log; import android.view.LayoutInflater; import android.view.Menu; @@ -88,6 +89,7 @@ public class ApnSettings extends SettingsPreferenceFragment implements private RestoreApnUiHandler mRestoreApnUiHandler; private RestoreApnProcessHandler mRestoreApnProcessHandler; private HandlerThread mRestoreDefaultApnThread; + private SubscriptionInfo mSubscriptionInfo; private UserManager mUm; @@ -128,6 +130,8 @@ public class ApnSettings extends SettingsPreferenceFragment implements @Override public void onCreate(Bundle icicle) { super.onCreate(icicle); + final Activity activity = getActivity(); + final int subId = activity.getIntent().getIntExtra("sub_id", -1); mUm = (UserManager) getSystemService(Context.USER_SERVICE); @@ -137,6 +141,8 @@ public class ApnSettings extends SettingsPreferenceFragment implements if (!mUm.hasUserRestriction(UserManager.DISALLOW_CONFIG_MOBILE_NETWORKS)) { setHasOptionsMenu(true); } + + mSubscriptionInfo = Utils.findRecordBySubId(activity, subId); } @Override @@ -196,8 +202,11 @@ public class ApnSettings extends SettingsPreferenceFragment implements } private void fillList() { - String where = "numeric=\"" - + android.os.SystemProperties.get(TelephonyProperties.PROPERTY_ICC_OPERATOR_NUMERIC, "") + final String mccmnc = mSubscriptionInfo == null ? "" + : Integer.toString(mSubscriptionInfo.getMcc()) + + Integer.toString(mSubscriptionInfo.getMnc()); + final String where = "numeric=\"" + + mccmnc + "\""; Cursor cursor = getContentResolver().query(Telephony.Carriers.CONTENT_URI, new String[] { |