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

Merge "Change the behavior of notifyAllowedNetworkTypesChanged." am: 3ac3cce15b

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

Change-Id: I74750b2abd69c47b753cd3ee6e69e4ec1bbd7339
This commit is contained in:
SongFerng Wang
2021-03-22 03:12:24 +00:00
committed by Automerger Merge Worker
parent 0080dfa65d 3ac3cce15b
commit b3f2e9090a
2 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -23,7 +23,6 @@ import android.util.Log;
import androidx.annotation.VisibleForTesting; import androidx.annotation.VisibleForTesting;
import java.util.Map;
import java.util.concurrent.Executor; import java.util.concurrent.Executor;
/** /**
@@ -70,9 +69,10 @@ public class AllowedNetworkTypesListener extends TelephonyCallback implements
} }
@Override @Override
public void onAllowedNetworkTypesChanged(Map<Integer, Long> allowedNetworkTypesList) { public void onAllowedNetworkTypesChanged(int reason, long newAllowedNetworkType) {
long newAllowedNetworkType = allowedNetworkTypesList.get( if (reason != TelephonyManager.ALLOWED_NETWORK_TYPES_REASON_USER) {
TelephonyManager.ALLOWED_NETWORK_TYPES_REASON_USER); return;
}
if (mListener != null && mAllowedNetworkType != newAllowedNetworkType) { if (mListener != null && mAllowedNetworkType != newAllowedNetworkType) {
mListener.onAllowedNetworkTypesChanged(); mListener.onAllowedNetworkTypesChanged();
Log.d(LOG_TAG, "onAllowedNetworkChanged: " + mAllowedNetworkType); Log.d(LOG_TAG, "onAllowedNetworkChanged: " + mAllowedNetworkType);

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

@@ -40,9 +40,6 @@ import org.junit.runner.RunWith;
import org.mockito.Mock; import org.mockito.Mock;
import org.mockito.MockitoAnnotations; import org.mockito.MockitoAnnotations;
import java.util.HashMap;
import java.util.Map;
@RunWith(AndroidJUnit4.class) @RunWith(AndroidJUnit4.class)
public class AllowedNetworkTypesListenerTest { public class AllowedNetworkTypesListenerTest {
@@ -73,12 +70,11 @@ public class AllowedNetworkTypesListenerTest {
@Test @Test
public void onChange_shouldCallListener() { public void onChange_shouldCallListener() {
mAllowedNetworkTypesListener.mListener = mListener; mAllowedNetworkTypesListener.mListener = mListener;
Map<Integer, Long> allowedNetworkTypesList = new HashMap<>();
long networkType = (long) RadioAccessFamily.getRafFromNetworkType( long networkType = (long) RadioAccessFamily.getRafFromNetworkType(
TelephonyManager.NETWORK_MODE_LTE_CDMA_EVDO); TelephonyManager.NETWORK_MODE_LTE_CDMA_EVDO);
allowedNetworkTypesList.put(TelephonyManager.ALLOWED_NETWORK_TYPES_REASON_USER,
networkType); mAllowedNetworkTypesListener.onAllowedNetworkTypesChanged(
mAllowedNetworkTypesListener.onAllowedNetworkTypesChanged(allowedNetworkTypesList); TelephonyManager.ALLOWED_NETWORK_TYPES_REASON_USER, networkType);
verify(mListener).onAllowedNetworkTypesChanged(); verify(mListener).onAllowedNetworkTypesChanged();
} }