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

Commit a5035d9c authored by SongFerngWang's avatar SongFerngWang Committed by SongFerng Wang
Browse files

Add NR SA OVERRIDE_NETWORK_TYPE_NR_ADVANCED for TelephonyDisplayInfo 

NetworkTypeController set OVERRIDE_NETWORK_TYPE_NR_ADVANCED when
device connect NR and frequency is mmWave.

Bug: 179443240
Bug: 179453836
Test: atest frameworks/opt/telephony/src/java/com/android/internal/telephony/NetworkTypeController.java
atest packages/apps/Settings/tests/unit/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogControllerTest.java

Change-Id: Ib95f6a012c0f725335f46e17b8414005a76ad5c9
Merged-In: Ib95f6a012c0f725335f46e17b8414005a76ad5c9
parent 74eb482f

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";

        }