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

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

Merge "Only allow NR override network types on SA" am: fed28ed7 am: f0b12238 

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



Change-Id: I5e60228215e9807f7c28319234aac91019b66a45
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4d389357 f0b12238

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

+1 −1
Original line number Diff line number Diff line
@@ -440,7 +440,7 @@ public class NetworkTypeController extends StateMachine { 
        if (mIsPhysicalChannelConfigOn && (nrNsa || nrSa)) {

            // Process NR display network type

            displayNetworkType = getNrDisplayType(nrSa);

            if (displayNetworkType == TelephonyDisplayInfo.OVERRIDE_NETWORK_TYPE_NONE) {

            if (displayNetworkType == TelephonyDisplayInfo.OVERRIDE_NETWORK_TYPE_NONE && !nrSa) {

                // Use LTE values if 5G values aren't defined

                displayNetworkType = getLteDisplayType();

            }