From c18545e14af193a1c99f7b2dfe53f69260db49af Mon Sep 17 00:00:00 2001 From: SongFerngWang Date: Mon, 8 Feb 2021 16:08:54 +0800 Subject: [PATCH] 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 Change-Id: I242e8499a1bb31dcb5a3f0fbae2f8423c8c8f8a0 Merged-In: I242e8499a1bb31dcb5a3f0fbae2f8423c8c8f8a0 --- core/api/current.txt | 3 ++- .../settingslib/mobile/MobileMappings.java | 4 ++-- .../java/android/telephony/Annotation.java | 2 +- .../telephony/TelephonyDisplayInfo.java | 19 ++++++++++++++++++- 4 files changed, 23 insertions(+), 5 deletions(-) diff --git a/core/api/current.txt b/core/api/current.txt index 838dd55e34d59..19c87100d1f5f 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -42011,8 +42011,9 @@ package android.telephony { field public static final int OVERRIDE_NETWORK_TYPE_LTE_ADVANCED_PRO = 2; // 0x2 field public static final int OVERRIDE_NETWORK_TYPE_LTE_CA = 1; // 0x1 field public static final int OVERRIDE_NETWORK_TYPE_NONE = 0; // 0x0 + field public static final int OVERRIDE_NETWORK_TYPE_NR_ADVANCED = 4; // 0x4 field public static final int OVERRIDE_NETWORK_TYPE_NR_NSA = 3; // 0x3 - field public static final int OVERRIDE_NETWORK_TYPE_NR_NSA_MMWAVE = 4; // 0x4 + field @Deprecated public static final int OVERRIDE_NETWORK_TYPE_NR_NSA_MMWAVE = 4; // 0x4 } public class TelephonyManager { diff --git a/packages/SettingsLib/src/com/android/settingslib/mobile/MobileMappings.java b/packages/SettingsLib/src/com/android/settingslib/mobile/MobileMappings.java index 09f285b445e94..14a7cfa568d89 100644 --- a/packages/SettingsLib/src/com/android/settingslib/mobile/MobileMappings.java +++ b/packages/SettingsLib/src/com/android/settingslib/mobile/MobileMappings.java @@ -65,7 +65,7 @@ public class MobileMappings { return toIconKey(TelephonyManager.NETWORK_TYPE_LTE) + "_CA_Plus"; case TelephonyDisplayInfo.OVERRIDE_NETWORK_TYPE_NR_NSA: return toIconKey(TelephonyManager.NETWORK_TYPE_NR); - case TelephonyDisplayInfo.OVERRIDE_NETWORK_TYPE_NR_NSA_MMWAVE: + case TelephonyDisplayInfo.OVERRIDE_NETWORK_TYPE_NR_ADVANCED: return toIconKey(TelephonyManager.NETWORK_TYPE_NR) + "_Plus"; default: return "unsupported"; @@ -180,7 +180,7 @@ public class MobileMappings { TelephonyDisplayInfo.OVERRIDE_NETWORK_TYPE_NR_NSA), TelephonyIcons.NR_5G); networkToIconLookup.put(toDisplayIconKey( - TelephonyDisplayInfo.OVERRIDE_NETWORK_TYPE_NR_NSA_MMWAVE), + TelephonyDisplayInfo.OVERRIDE_NETWORK_TYPE_NR_ADVANCED), TelephonyIcons.NR_5G_PLUS); networkToIconLookup.put(toIconKey( TelephonyManager.NETWORK_TYPE_NR), diff --git a/telephony/java/android/telephony/Annotation.java b/telephony/java/android/telephony/Annotation.java index 99f2e5ee07558..c6757fba4d53a 100644 --- a/telephony/java/android/telephony/Annotation.java +++ b/telephony/java/android/telephony/Annotation.java @@ -646,7 +646,7 @@ public class Annotation { TelephonyDisplayInfo.OVERRIDE_NETWORK_TYPE_LTE_CA, TelephonyDisplayInfo.OVERRIDE_NETWORK_TYPE_LTE_ADVANCED_PRO, TelephonyDisplayInfo.OVERRIDE_NETWORK_TYPE_NR_NSA, - TelephonyDisplayInfo.OVERRIDE_NETWORK_TYPE_NR_NSA_MMWAVE}) + TelephonyDisplayInfo.OVERRIDE_NETWORK_TYPE_NR_ADVANCED}) public @interface OverrideNetworkType {} /** diff --git a/telephony/java/android/telephony/TelephonyDisplayInfo.java b/telephony/java/android/telephony/TelephonyDisplayInfo.java index 1fcb504e78954..5b5570b27a9b8 100644 --- a/telephony/java/android/telephony/TelephonyDisplayInfo.java +++ b/telephony/java/android/telephony/TelephonyDisplayInfo.java @@ -66,9 +66,26 @@ public final class TelephonyDisplayInfo implements Parcelable { * {@link TelephonyManager#NETWORK_TYPE_LTE} network and has E-UTRA-NR Dual Connectivity(EN-DC) * capability or is currently connected to the secondary * {@link TelephonyManager#NETWORK_TYPE_NR} cellular network on millimeter wave bands. + * @deprecated Use{@link #OVERRIDE_NETWORK_TYPE_NR_ADVANCED} instead. */ + @Deprecated public static final int OVERRIDE_NETWORK_TYPE_NR_NSA_MMWAVE = 4; + /** + * Override network type when the device is connected NR cellular network and the data rate is + * higher than the generic 5G date rate. + * Including but not limited to + * + * One of the use case is that UX can show a different icon, for example, "5G+" + */ + public static final int OVERRIDE_NETWORK_TYPE_NR_ADVANCED = 4; + @NetworkType private final int mNetworkType; @@ -169,7 +186,7 @@ public final class TelephonyDisplayInfo implements Parcelable { case OVERRIDE_NETWORK_TYPE_LTE_CA: return "LTE_CA"; case OVERRIDE_NETWORK_TYPE_LTE_ADVANCED_PRO: return "LTE_ADV_PRO"; case OVERRIDE_NETWORK_TYPE_NR_NSA: return "NR_NSA"; - case OVERRIDE_NETWORK_TYPE_NR_NSA_MMWAVE: return "NR_NSA_MMWAVE"; + case OVERRIDE_NETWORK_TYPE_NR_ADVANCED: return "NR_NSA_MMWAVE"; default: return "UNKNOWN"; } }