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

Commit 98d2161f 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

Change-Id: I99d67d094f3fe19fe18bf87460d38699db15af95
parents a5d98cd4 edf6f19f

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