PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add NR SA OVERRIDE_NETWORK_TYPE_NR_ADVANCED for TelephonyDisplayInfo" into sc-dev am: 374ae167e1

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13515168

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2552756df631eb10a7418c36623c9957dc5bfa8d
This commit is contained in:
SongFerng Wang
2021-02-11 08:50:32 +00:00
committed by Automerger Merge Worker
parent 62625e5873 374ae167e1
commit a836735535
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/com/android/settings/deviceinfo/simstatus/SimStatusDialogController.java
View File

@@ -550,8 +550,11 @@ public class SimStatusDialogController implements LifecycleObserver {
voiceNetworkTypeName = getNetworkTypeName(actualVoiceNetworkType); voiceNetworkTypeName = getNetworkTypeName(actualVoiceNetworkType);
} }
if (overrideNetworkType == TelephonyDisplayInfo.OVERRIDE_NETWORK_TYPE_NR_NSA_MMWAVE final boolean isOverrideNwTypeNrAdvancedOrNsa =
|| overrideNetworkType == TelephonyDisplayInfo.OVERRIDE_NETWORK_TYPE_NR_NSA) { overrideNetworkType == TelephonyDisplayInfo.OVERRIDE_NETWORK_TYPE_NR_ADVANCED
|| overrideNetworkType == TelephonyDisplayInfo.OVERRIDE_NETWORK_TYPE_NR_NSA;
if (actualDataNetworkType == TelephonyManager.NETWORK_TYPE_LTE
&& isOverrideNwTypeNrAdvancedOrNsa) {
dataNetworkTypeName = "NR NSA"; dataNetworkTypeName = "NR NSA";
} }