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

Commit 8e248af8 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Preferred network mode transform to BitMask type." into rvc-dev am: 2fe809be 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/11696874

Change-Id: I0900522fe5cbe7fae9f2026f6d1d371420bbf131
parents 7ca6e258 2fe809be

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

+3 −2
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ import android.telephony.Annotation; 
import android.telephony.CarrierConfigManager;

import android.telephony.NetworkRegistrationInfo;

import android.telephony.PhoneStateListener;

import android.telephony.RadioAccessFamily;

import android.telephony.ServiceState;

import android.telephony.SubscriptionManager;

import android.telephony.TelephonyDisplayInfo;
@@ -357,8 +358,8 @@ public class NetworkTypeController extends StateMachine { 


    private @Annotation.OverrideNetworkType int getNrDisplayType() {

        // Don't show 5G icon if preferred network type does not include 5G

        if ((mPhone.getCachedPreferredNetworkType() & TelephonyManager.NETWORK_TYPE_BITMASK_NR)

                == 0) {

        if ((RadioAccessFamily.getRafFromNetworkType(mPhone.getCachedPreferredNetworkType())

                & TelephonyManager.NETWORK_TYPE_BITMASK_NR) == 0) {

            return TelephonyDisplayInfo.OVERRIDE_NETWORK_TYPE_NONE;

        }

        // Icon display keys in order of priority

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

+1 −1
Original line number Diff line number Diff line
@@ -88,7 +88,7 @@ public class NetworkTypeControllerTest extends TelephonyTest { 
        broadcastCarrierConfigs();



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

        doReturn((int) TelephonyManager.NETWORK_TYPE_BITMASK_NR).when(mPhone)

        doReturn((int) TelephonyManager.NETWORK_MODE_NR_LTE_CDMA_EVDO_GSM_WCDMA).when(mPhone)

                .getCachedPreferredNetworkType();

        mNetworkTypeController = new NetworkTypeController(mPhone, mDisplayInfoController);

    }