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

Browse Source
This commit is contained in:
SongFerng Wang
2021-07-15 11:58:45 +00:00
committed by Android (Google) Code Review
parent 381bbbda8d 74a6ffaa91
commit 685fedd6c2
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);

14
tests/unit/src/com/android/settings/network/AllowedNetworkTypesListenerTest.java
View File

@@ -68,7 +68,7 @@ public class AllowedNetworkTypesListenerTest {
}
@Test
public void onChange_shouldCallListener() {
public void onChange_userReasonChanged_shouldCallListener() {
mAllowedNetworkTypesListener.mListener = mListener;
long networkType = (long) RadioAccessFamily.getRafFromNetworkType(
TelephonyManager.NETWORK_MODE_LTE_CDMA_EVDO);
@@ -79,6 +79,18 @@ public class AllowedNetworkTypesListenerTest {
verify(mListener).onAllowedNetworkTypesChanged();
}
@Test
public void onChange_carrierReasonChanged_shouldCallListener() {
mAllowedNetworkTypesListener.mListener = mListener;
long networkType = (long) RadioAccessFamily.getRafFromNetworkType(
TelephonyManager.NETWORK_MODE_LTE_CDMA_EVDO);
mAllowedNetworkTypesListener.onAllowedNetworkTypesChanged(
TelephonyManager.ALLOWED_NETWORK_TYPES_REASON_CARRIER, networkType);
verify(mListener).onAllowedNetworkTypesChanged();
}
@Test
public void register_shouldRegisterContentObserver() {
mAllowedNetworkTypesListener.register(mContext, SUB_ID);