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

Merge "Let network mode UI refresh when network type with carrier group changed" into sc-dev am: 685fedd6c2

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15283582

Change-Id: Idf28e6e41aff03a0ce2aa16752be455794be16b7
This commit is contained in:
SongFerng Wang
2021-07-15 12:10:50 +00:00
committed by Automerger Merge Worker
parent 05207bf774 685fedd6c2
commit 47837d28c1
3 changed files with 21 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/com/android/settings/network/AllowedNetworkTypesListener.java
View File

@@ -34,7 +34,6 @@ public class AllowedNetworkTypesListener extends TelephonyCallback implements
@VisibleForTesting
OnAllowedNetworkTypesListener mListener;
private long mAllowedNetworkType = -1;
private Executor mExecutor;
public AllowedNetworkTypesListener(Executor executor) {
@@ -70,14 +69,14 @@ public class AllowedNetworkTypesListener extends TelephonyCallback implements
@Override
public void onAllowedNetworkTypesChanged(int reason, long newAllowedNetworkType) {
if (reason != TelephonyManager.ALLOWED_NETWORK_TYPES_REASON_USER) {
if (reason != TelephonyManager.ALLOWED_NETWORK_TYPES_REASON_USER
&& reason != TelephonyManager.ALLOWED_NETWORK_TYPES_REASON_CARRIER) {
return;
}
if (mListener != null && mAllowedNetworkType != newAllowedNetworkType) {
if (mListener != null) {
mListener.onAllowedNetworkTypesChanged();
Log.d(LOG_TAG, "onAllowedNetworkChanged: " + mAllowedNetworkType);
Log.d(LOG_TAG, "onAllowedNetworkChanged: " + newAllowedNetworkType);
}
mAllowedNetworkType = newAllowedNetworkType;
}
/**

5
src/com/android/settings/network/telephony/EnabledNetworkModePreferenceController.java
View File

@@ -152,7 +152,10 @@ public class EnabledNetworkModePreferenceController extends
mAllowedNetworkTypesListener = new AllowedNetworkTypesListener(
mContext.getMainExecutor());
mAllowedNetworkTypesListener.setAllowedNetworkTypesListener(
() -> updatePreference());
() -> {
mBuilder.updateConfig();
updatePreference();
});
}
lifecycle.addObserver(this);