| commit | 5a173dad6c1011a0c4adf7457b552e74f1fa7d04 | [log] [tgz] |
|---|---|---|
| author | Sarah Chin <sarahchin@google.com> | Tue Jun 08 21:10:17 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Jun 08 21:10:17 2021 +0000 |
| tree | a8e89c4f5f43a9e90b75dab9c3fbc19b1e9efa26 | |
| parent | 2b98c25bcfbab30f39cfa1a8c768237ba1036b3d [diff] | |
| parent | 8222d88548d4899a7b2f695219a6bc18e7a2962c [diff] |
Merge "Add NR SA OVERRIDE_NETWORK_TYPE_NR_ADVANCED for TelephonyDisplayInfo" am: 8222d88548 Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1681974 Change-Id: I467a109a5387e4d1bc0da4e83c6e12ceea24d6bf
diff --git a/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogController.java b/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogController.java index 10409fc..4d1fd49 100644 --- a/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogController.java +++ b/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogController.java
@@ -538,8 +538,11 @@ 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"; }