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

Merge "Reload APNs setting page when receive the intent ACTION_SUBSCRIPTION_CARRIER_IDENTITY_CHANGED"

Browse Source 
am: 5b7535d5b4

Change-Id: I7b1f6e53c521c0f17d17199de2f185eb64fd3c59
This commit is contained in:
Jordan Liu
2018-08-14 20:09:31 -07:00
committed by android-build-merger
parent 188272e12b 5b7535d5b4
commit b951ba66e5
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -110,7 +110,7 @@ public class ApnSettings extends RestrictedSettingsFragment implements
private String mSelectedKey; private String mSelectedKey;
private IntentFilter mMobileStateFilter; private IntentFilter mIntentFilter;
private boolean mUnavailable; private boolean mUnavailable;
@@ -121,7 +121,7 @@ public class ApnSettings extends RestrictedSettingsFragment implements
super(UserManager.DISALLOW_CONFIG_MOBILE_NETWORKS); super(UserManager.DISALLOW_CONFIG_MOBILE_NETWORKS);
} }
private final BroadcastReceiver mMobileStateReceiver = new BroadcastReceiver() { private final BroadcastReceiver mReceiver = new BroadcastReceiver() {
@Override @Override
public void onReceive(Context context, Intent intent) { public void onReceive(Context context, Intent intent) {
if (intent.getAction().equals( if (intent.getAction().equals(
@@ -136,6 +136,11 @@ public class ApnSettings extends RestrictedSettingsFragment implements
} }
break; break;
} }
} else if(intent.getAction().equals(
TelephonyManager.ACTION_SUBSCRIPTION_CARRIER_IDENTITY_CHANGED)) {
if (!mRestoreDefaultApnMode) {
fillList();
}
} }
} }
}; };
@@ -161,8 +166,9 @@ public class ApnSettings extends RestrictedSettingsFragment implements
final int subId = activity.getIntent().getIntExtra(SUB_ID, final int subId = activity.getIntent().getIntExtra(SUB_ID,
SubscriptionManager.INVALID_SUBSCRIPTION_ID); SubscriptionManager.INVALID_SUBSCRIPTION_ID);
mMobileStateFilter = 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);
setIfOnlyAvailableForAdmins(true); setIfOnlyAvailableForAdmins(true);
@@ -209,7 +215,7 @@ public class ApnSettings extends RestrictedSettingsFragment implements
return; return;
} }
getActivity().registerReceiver(mMobileStateReceiver, mMobileStateFilter); getActivity().registerReceiver(mReceiver, mIntentFilter);
if (!mRestoreDefaultApnMode) { if (!mRestoreDefaultApnMode) {
fillList(); fillList();
@@ -224,7 +230,7 @@ public class ApnSettings extends RestrictedSettingsFragment implements
return; return;
} }
getActivity().unregisterReceiver(mMobileStateReceiver); getActivity().unregisterReceiver(mReceiver);
} }
@Override @Override