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

Merge "Change the behavior of notifyAllowedNetworkTypesChanged."

Browse Source
This commit is contained in:
SongFerng Wang
2021-03-21 16:45:59 +00:00
committed by Gerrit Code Review
parent 3e737c11db 2166de23f3
commit 3ac3cce15b
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 java.util.Map;
import java.util.concurrent.Executor;
/**
@@ -70,9 +69,10 @@ public class AllowedNetworkTypesListener extends TelephonyCallback implements
}
@Override
public void onAllowedNetworkTypesChanged(Map<Integer, Long> allowedNetworkTypesList) {
long newAllowedNetworkType = allowedNetworkTypesList.get(
TelephonyManager.ALLOWED_NETWORK_TYPES_REASON_USER);
public void onAllowedNetworkTypesChanged(int reason, long newAllowedNetworkType) {
if (reason != TelephonyManager.ALLOWED_NETWORK_TYPES_REASON_USER) {
return;
}
if (mListener != null && mAllowedNetworkType != newAllowedNetworkType) {
mListener.onAllowedNetworkTypesChanged();
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.MockitoAnnotations;
import java.util.HashMap;
import java.util.Map;
@RunWith(AndroidJUnit4.class)
public class AllowedNetworkTypesListenerTest {
@@ -73,12 +70,11 @@ public class AllowedNetworkTypesListenerTest {
@Test
public void onChange_shouldCallListener() {
mAllowedNetworkTypesListener.mListener = mListener;
Map<Integer, Long> allowedNetworkTypesList = new HashMap<>();
long networkType = (long) RadioAccessFamily.getRafFromNetworkType(
TelephonyManager.NETWORK_MODE_LTE_CDMA_EVDO);
allowedNetworkTypesList.put(TelephonyManager.ALLOWED_NETWORK_TYPES_REASON_USER,
networkType);
mAllowedNetworkTypesListener.onAllowedNetworkTypesChanged(allowedNetworkTypesList);
mAllowedNetworkTypesListener.onAllowedNetworkTypesChanged(
TelephonyManager.ALLOWED_NETWORK_TYPES_REASON_USER, networkType);
verify(mListener).onAllowedNetworkTypesChanged();
}