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

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

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

Merge "Revert "Consider preferred network type for 5G icon"" into rvc-dev am: 612ab308 am: edf6f19f am: 7dd7ad9f

Change-Id: I71289430a384902fd0d4363ce0cd7369c42470c7
parents b0ec46f8 7dd7ad9f

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

+0 −5
Original line number Diff line number Diff line
@@ -351,11 +351,6 @@ 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

+0 −2
Original line number Diff line number Diff line
@@ -89,8 +89,6 @@ 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