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

Commit 4ba62e05 authored by Sarah Chin's avatar Sarah Chin
Browse files

Revert "Consider preferred network type for 5G icon" 

This reverts commit f39ef5f6.

Reason for revert: b/155958112

Change-Id: I9aa79f4bcaf3bde51468c3d1e83e9bb01a4a8e59
Merged-In: I6fadabaea9eb2b051e2e2fc6daf3f8b642ddaccc
parent f39ef5f6

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

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