Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 34c8d35c authored by SongFerng Wang's avatar SongFerng Wang Committed by Automerger Merge Worker
Browse files

Merge "Change the behavior of notifyAllowedNetworkTypesChanged." am: 3ac3cce1 am: b3f2e909 

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

Change-Id: I5ba679ca3d2a6f6411dae1ffdc441527508d4763
parents 6c7f7090 b3f2e909

src/com/android/settings/network/AllowedNetworkTypesListener.java

+4 −4
Original line number Diff line number Diff line
@@ -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);

tests/unit/src/com/android/settings/network/AllowedNetworkTypesListenerTest.java

+3 −7
Original line number Diff line number Diff line
@@ -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();

    }