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" am: 8222d88548

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

Change-Id: I467a109a5387e4d1bc0da4e83c6e12ceea24d6bf
This commit is contained in:
Sarah Chin
2021-06-08 21:10:17 +00:00
committed by Automerger Merge Worker
parent 2b98c25bcf 8222d88548
commit 5a173dad6c
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

@@ -538,8 +538,11 @@ public class SimStatusDialogController implements LifecycleObserver, OnResume, O
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";
}