PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "In sim1 APN settings interface and hot plug out/in sim2, APN information change to sim2's" am: 51cb777530

Browse Source 
am: f28625bcf1

Change-Id: Ie151d421eae8321dc684f7d4a684f582fb60c3ac
This commit is contained in:
Daniel Huang
2019-09-24 02:39:02 -07:00
committed by android-build-merger
parent b26711944b f28625bcf1
commit 1fec213233
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/com/android/settings/network/ApnSettings.java
View File

@@ -113,6 +113,7 @@ public class ApnSettings extends RestrictedSettingsFragment
private HandlerThread mRestoreDefaultApnThread; private HandlerThread mRestoreDefaultApnThread;
private SubscriptionInfo mSubscriptionInfo; private SubscriptionInfo mSubscriptionInfo;
private int mSubId; private int mSubId;
private int mPhoneId;
private UiccController mUiccController; private UiccController mUiccController;
private String mMvnoType; private String mMvnoType;
private String mMvnoMatchData; private String mMvnoMatchData;
@@ -151,7 +152,9 @@ public class ApnSettings extends RestrictedSettingsFragment
if (!mRestoreDefaultApnMode) { if (!mRestoreDefaultApnMode) {
int extraSubId = intent.getIntExtra(TelephonyManager.EXTRA_SUBSCRIPTION_ID, int extraSubId = intent.getIntExtra(TelephonyManager.EXTRA_SUBSCRIPTION_ID,
SubscriptionManager.INVALID_SUBSCRIPTION_ID); SubscriptionManager.INVALID_SUBSCRIPTION_ID);
if (extraSubId != mSubId) { if (SubscriptionManager.isValidSubscriptionId(extraSubId) &&
mPhoneId == SubscriptionManager.getPhoneId(extraSubId) &&
extraSubId != mSubId) {
// subscription has changed // subscription has changed
mSubId = extraSubId; mSubId = extraSubId;
mSubscriptionInfo = getSubscriptionInfo(mSubId); mSubscriptionInfo = getSubscriptionInfo(mSubId);
@@ -182,7 +185,7 @@ public class ApnSettings extends RestrictedSettingsFragment
final Activity activity = getActivity(); final Activity activity = getActivity();
mSubId = activity.getIntent().getIntExtra(SUB_ID, mSubId = activity.getIntent().getIntExtra(SUB_ID,
SubscriptionManager.INVALID_SUBSCRIPTION_ID); SubscriptionManager.INVALID_SUBSCRIPTION_ID);
mPhoneId = SubscriptionManager.getPhoneId(mSubId);
mIntentFilter = new IntentFilter( mIntentFilter = new IntentFilter(
TelephonyIntents.ACTION_ANY_DATA_CONNECTION_STATE_CHANGED); TelephonyIntents.ACTION_ANY_DATA_CONNECTION_STATE_CHANGED);
mIntentFilter.addAction(TelephonyManager.ACTION_SUBSCRIPTION_CARRIER_IDENTITY_CHANGED); mIntentFilter.addAction(TelephonyManager.ACTION_SUBSCRIPTION_CARRIER_IDENTITY_CHANGED);