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

Commit ae52b323 authored by Sarah Chin's avatar Sarah Chin Committed by Automerger Merge Worker
Browse files

Use cached preferred network type for 5G icon am: 7a4afd39 am: 36565685 

Change-Id: Ib9e5a466c84bd2b0e9a66ce750c787b3e47b7211
parents 6bea0869 36565685

src/java/com/android/internal/telephony/NetworkTypeController.java

+5 −0
Original line number Diff line number Diff line
@@ -351,6 +351,11 @@ public class NetworkTypeController extends StateMachine { 
    }



    private @Annotation.OverrideNetworkType int getNrDisplayType() {

        // Don't show 5G icon if preferred network type does not include 5G

        if ((mPhone.getCachedPreferredNetworkType() & TelephonyManager.NETWORK_TYPE_BITMASK_NR)

                == 0) {

            return TelephonyDisplayInfo.OVERRIDE_NETWORK_TYPE_NONE;

        }

        // Icon display keys in order of priority

        List<String> keys = new ArrayList<>();

        // TODO: Update for NR SA

src/java/com/android/internal/telephony/Phone.java

+12 −1
Original line number Diff line number Diff line
@@ -2212,6 +2212,17 @@ public abstract class Phone extends Handler implements PhoneInternalInterface { 
        mCi.getPreferredNetworkType(response);

    }



    /**

     * Get the cached value of the preferred network type setting

     */

    public int getCachedPreferredNetworkType() {

        if (mCi != null && mCi instanceof BaseCommands) {

            return ((BaseCommands) mCi).mPreferredNetworkType;

        } else {

            return RILConstants.PREFERRED_NETWORK_MODE;

        }

    }



    /**

     * Gets the default SMSC address.

     *

tests/telephonytests/src/com/android/internal/telephony/NetworkTypeControllerTest.java

+2 −0
Original line number Diff line number Diff line
@@ -88,6 +88,8 @@ public class NetworkTypeControllerTest extends TelephonyTest { 
        broadcastCarrierConfigs();



        replaceInstance(Handler.class, "mLooper", mDisplayInfoController, Looper.myLooper());

        doReturn((int) TelephonyManager.NETWORK_TYPE_BITMASK_NR).when(mPhone)

                .getCachedPreferredNetworkType();

        mNetworkTypeController = new NetworkTypeController(mPhone, mDisplayInfoController);

    }