Merge "Add NR SA OVERRIDE_NETWORK_TYPE_NR_ADVANCED for TelephonyDisplayInfo" (3418adf6) · Commits · e / os / android_frameworks_base

core/api/current.txt

+2 −1

Original line number	Diff line number	Diff line
		@@ -42039,8 +42039,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 {

packages/SettingsLib/src/com/android/settingslib/mobile/MobileMappings.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -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),

telephony/java/android/telephony/Annotation.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -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 {}

		/**

telephony/java/android/telephony/TelephonyDisplayInfo.java

+18 −1

Original line number	Diff line number	Diff line
		@@ -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
		* <ul>
		* <li>The device is connected to the NR cellular network on millimeter wave bands. </li>
		* <li>The device is connected to the specific network which the carrier is using
		* proprietary means to provide a faster overall data connection than would be otherwise
		* possible. This may include using other bands unique to the carrier, or carrier
		* aggregation, for example.</li>
		* </ul>
		* 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";
		}
		}