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

Commit e32dbb6a 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: 612ab308 

Change-Id: I2d34f9cbf517fa31de3e44f55b859b78ebe34415
parents 6548f6eb 612ab308

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