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
This commit is contained in:
TreeHugger Robot
2018-04-23 17:48:12 +00:00
committed by Android (Google) Code Review
parent fca1b345cc febf094fbc
commit b1f1ebad89
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

@@ -109,7 +109,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;
@@ -120,7 +120,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(
@@ -135,6 +135,11 @@ public class ApnSettings extends RestrictedSettingsFragment implements
} }
break; break;
} }
} else if(intent.getAction().equals(
TelephonyManager.ACTION_SUBSCRIPTION_CARRIER_IDENTITY_CHANGED)) {
if (!mRestoreDefaultApnMode) {
fillList();
}
} }
} }
}; };
@@ -160,8 +165,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);
@@ -208,7 +214,7 @@ public class ApnSettings extends RestrictedSettingsFragment implements
return; return;
} }
getActivity().registerReceiver(mMobileStateReceiver, mMobileStateFilter); getActivity().registerReceiver(mReceiver, mIntentFilter);
if (!mRestoreDefaultApnMode) { if (!mRestoreDefaultApnMode) {
fillList(); fillList();
@@ -223,7 +229,7 @@ public class ApnSettings extends RestrictedSettingsFragment implements
return; return;
} }
getActivity().unregisterReceiver(mMobileStateReceiver); getActivity().unregisterReceiver(mReceiver);
} }
@Override @Override