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

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

Merge "Consider preferred network type for 5G icon" into rvc-dev am: 2bf9c7ac 

Change-Id: I42771df4d26ff25de467b16f9fd99700f4c9eec2
parents 9c670ba6 2bf9c7ac

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 ((mTelephonyManager.getPreferredNetworkTypeBitmask()

                & 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

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

+2 −0
Original line number Diff line number Diff line
@@ -89,6 +89,8 @@ public class NetworkTypeControllerTest extends TelephonyTest { 


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

        mNetworkTypeController = new NetworkTypeController(mPhone, mDisplayInfoController);

        doReturn(TelephonyManager.NETWORK_TYPE_BITMASK_NR)

                .when(mTelephonyManager).getPreferredNetworkTypeBitmask();

    }



    @After