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

Commit 374ae167 authored by SongFerng Wang's avatar SongFerng Wang Committed by Android (Google) Code Review
Browse files

Merge "Add NR SA OVERRIDE_NETWORK_TYPE_NR_ADVANCED for TelephonyDisplayInfo" into sc-dev

parents 2b9f139a a5035d9c

src/com/android/settings/deviceinfo/simstatus/SimStatusDialogController.java

+5 −2
Original line number Diff line number Diff line
@@ -550,8 +550,11 @@ public class SimStatusDialogController implements LifecycleObserver { 
            voiceNetworkTypeName = getNetworkTypeName(actualVoiceNetworkType);

        }



        if (overrideNetworkType == TelephonyDisplayInfo.OVERRIDE_NETWORK_TYPE_NR_NSA_MMWAVE

                || overrideNetworkType == TelephonyDisplayInfo.OVERRIDE_NETWORK_TYPE_NR_NSA) {

        final boolean isOverrideNwTypeNrAdvancedOrNsa =

                overrideNetworkType == TelephonyDisplayInfo.OVERRIDE_NETWORK_TYPE_NR_ADVANCED

                        || overrideNetworkType == TelephonyDisplayInfo.OVERRIDE_NETWORK_TYPE_NR_NSA;

        if (actualDataNetworkType == TelephonyManager.NETWORK_TYPE_LTE

                && isOverrideNwTypeNrAdvancedOrNsa) {

            dataNetworkTypeName = "NR NSA";

        }