117 lines
5.0 KiB
Diff
117 lines
5.0 KiB
Diff
From d019a2cf56c0c25c2e99caa79c42e18c4e18ae00 Mon Sep 17 00:00:00 2001
|
|
From: Vala Zadeh <quic_vzadeh@quicinc.com>
|
|
Date: Wed, 18 May 2022 16:57:43 -0700
|
|
Subject: [PATCH 1/2] Add 5G Ultra Wideband icon carrier config keys
|
|
|
|
Change-Id: Idc6da92fb41a780d01c961d676f61ae4b91d2a7b
|
|
CRs-Fixed: 3218447
|
|
---
|
|
.../telephony/CarrierConfigManager.java | 84 +++++++++++++++++++
|
|
1 file changed, 84 insertions(+)
|
|
|
|
diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java
|
|
index 7cb2cc398c46..570ee2aa8628 100644
|
|
--- a/telephony/java/android/telephony/CarrierConfigManager.java
|
|
+++ b/telephony/java/android/telephony/CarrierConfigManager.java
|
|
@@ -10038,6 +10038,81 @@ public class CarrierConfigManager {
|
|
public static final String KEY_AUTO_DATA_SWITCH_RAT_SIGNAL_SCORE_BUNDLE =
|
|
"auto_data_switch_rat_signal_score_string_bundle";
|
|
|
|
+ /**
|
|
+ * Determines the SIB2 value for showing the 5G Ultra Wideband icon.
|
|
+ * The rest of the NR Ultra Wideband configs will be considere only if this value is 1. A value
|
|
+ * of 0 means the other NR Ultra Wideband configs will not be considered.
|
|
+ *
|
|
+ * @hide
|
|
+ */
|
|
+ public static final String KEY_NR_ULTRA_WIDEBAND_ICON_SIB2_VALUE =
|
|
+ "5g_ultra_wideband_icon_sib2_value";
|
|
+
|
|
+ /**
|
|
+ * Determines the minimum aggregate bandwidth for showing the 5G Ultra Wideband icon.
|
|
+ *
|
|
+ * @hide
|
|
+ */
|
|
+ public static final String KEY_NR_ULTRA_WIDEBAND_ICON_MIN_BANDWIDTH_VALUE =
|
|
+ "5g_ultra_wideband_icon_min_bandwidth_value";
|
|
+
|
|
+ /**
|
|
+ * Determines the minimum aggregate bandwidth mode for which the 5G Ultra Wideband icon will be
|
|
+ * shown. The following modes are allowed: NONE, CONNECTED, IDLE, CONNECTED_AND_IDLE
|
|
+ *
|
|
+ * @hide
|
|
+ */
|
|
+ public static final String KEY_NR_ULTRA_WIDEBAND_ICON_MIN_BANDWIDTH_MODE =
|
|
+ "5g_ultra_wideband_icon_min_bandwidth_mode";
|
|
+
|
|
+ /**
|
|
+ * Determines the 5G Ultra Wideband icon refresh timer type (key) and the refresh timer value
|
|
+ * (value) in seconds.
|
|
+ * The following types are allowed for the type: SCG_TO_MCG, IDLE_TO_CONNECT, IDLE
|
|
+ *
|
|
+ * @hide
|
|
+ */
|
|
+ public static final String KEY_NR_ULTRA_WIDEBAND_ICON_REFRESH_TIMER_MAP =
|
|
+ "5g_ultra_wideband_icon_refresh_timer_map";
|
|
+
|
|
+ /**
|
|
+ * Determines the mode in which the 5G Ultra Wideband icon will be shown for 5G NSA bands.
|
|
+ * The following modes are allowed: NONE, CONNECTED, IDLE, CONNECTED_AND_IDLE
|
|
+ *
|
|
+ * @hide
|
|
+ */
|
|
+ public static final String KEY_NR_ULTRA_WIDEBAND_ICON_NSA_BAND_MODE =
|
|
+ "5g_ultra_wideband_icon_nsa_band_mode";
|
|
+
|
|
+ /**
|
|
+ * Determines the list of 5G NSA bands for which 5G Ultra Wideband icons must be shown.
|
|
+ * For each list entry, the allowed values are either enabled (show the 5G Ultra Wideband icon)
|
|
+ * or disabled (do not show the 5G Ultra Wideband icon).
|
|
+ *
|
|
+ * @hide
|
|
+ */
|
|
+ public static final String KEY_NR_ULTRA_WIDEBAND_ICON_NSA_BAND_ARRAY =
|
|
+ "5g_ultra_wideband_icon_nsa_band_array";
|
|
+
|
|
+ /**
|
|
+ * Determines the mode in which the 5G Ultra Wideband icon will be shown for 5G SA bands.
|
|
+ * The following modes are allowed: NONE, CONNECTED, IDLE, CONNECTED_AND_IDLE
|
|
+ *
|
|
+ * @hide
|
|
+ */
|
|
+ public static final String KEY_NR_ULTRA_WIDEBAND_ICON_SA_BAND_MODE =
|
|
+ "5g_ultra_wideband_icon_sa_band_mode";
|
|
+
|
|
+ /**
|
|
+ * Determines the list of 5G SA bands for which 5G Ultra Wideband icons must be shown.
|
|
+ * For each list entry, the allowed values are either enabled (show the 5G Ultra Wideband icon)
|
|
+ * or disabled (do not show the 5G Ultra Wideband icon).
|
|
+ *
|
|
+ * @hide
|
|
+ */
|
|
+ public static final String KEY_NR_ULTRA_WIDEBAND_ICON_SA_BAND_ARRAY =
|
|
+ "5g_ultra_wideband_icon_sa_band_array";
|
|
+
|
|
/** The default value for every variable. */
|
|
private static final PersistableBundle sDefaults;
|
|
|
|
@@ -10671,6 +10746,15 @@ public class CarrierConfigManager {
|
|
"enterprise:0", "default:1", "mms:2", "supl:2", "dun:2", "hipri:3", "fota:2",
|
|
"ims:2", "cbs:2", "ia:2", "emergency:2", "mcx:3", "xcap:3"
|
|
});
|
|
+ sDefaults.putInt(KEY_NR_ULTRA_WIDEBAND_ICON_SIB2_VALUE, -1);
|
|
+ sDefaults.putInt(KEY_NR_ULTRA_WIDEBAND_ICON_MIN_BANDWIDTH_VALUE, 0);
|
|
+ sDefaults.putInt(KEY_NR_ULTRA_WIDEBAND_ICON_MIN_BANDWIDTH_MODE, 0);
|
|
+ sDefaults.putPersistableBundle(KEY_NR_ULTRA_WIDEBAND_ICON_REFRESH_TIMER_MAP,
|
|
+ PersistableBundle.EMPTY);
|
|
+ sDefaults.putInt(KEY_NR_ULTRA_WIDEBAND_ICON_NSA_BAND_MODE, 0);
|
|
+ sDefaults.putIntArray(KEY_NR_ULTRA_WIDEBAND_ICON_SA_BAND_ARRAY, new int[]{});
|
|
+ sDefaults.putInt(KEY_NR_ULTRA_WIDEBAND_ICON_SA_BAND_MODE, 0);
|
|
+ sDefaults.putIntArray(KEY_NR_ULTRA_WIDEBAND_ICON_NSA_BAND_ARRAY, new int[]{});
|
|
|
|
// Do not modify the priority unless you know what you are doing. This will have significant
|
|
// impacts on the order of data network setup.
|
|
--
|
|
2.25.1
|
|
|