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

Commit 47837d28 authored by SongFerng Wang's avatar SongFerng Wang Committed by Automerger Merge Worker
Browse files

Merge "Let network mode UI refresh when network type with carrier group... 

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

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

Change-Id: Idf28e6e41aff03a0ce2aa16752be455794be16b7
parents 05207bf7 685fedd6

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

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

    }



    /**

src/com/android/settings/network/telephony/EnabledNetworkModePreferenceController.java

+4 −1
Original line number Diff line number Diff line
@@ -152,7 +152,10 @@ public class EnabledNetworkModePreferenceController extends 
            mAllowedNetworkTypesListener = new AllowedNetworkTypesListener(

                    mContext.getMainExecutor());

            mAllowedNetworkTypesListener.setAllowedNetworkTypesListener(

                    () -> updatePreference());

                    () -> {

                        mBuilder.updateConfig();

                        updatePreference();

                    });

        }



        lifecycle.addObserver(this);

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

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