From 6c1f38e18d3ddc542d3013c6be876528b70632be Mon Sep 17 00:00:00 2001 From: SongFerngWang Date: Mon, 10 May 2021 22:43:14 +0800 Subject: Add carrier config nr_advanced_capable_pco_id_int This configuration allows the framework to control the NR advanced capable by protocol configuration options(PCO). Bug: 183379536 Test: atest NetworkTypeControllerTest Change-Id: I241700232325cc852c363e8efe567e14cfc7e0aa --- .../java/android/telephony/CarrierConfigManager.java | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java index 5716a1d79040..a807e53f77f8 100644 --- a/telephony/java/android/telephony/CarrierConfigManager.java +++ b/telephony/java/android/telephony/CarrierConfigManager.java @@ -3472,6 +3472,21 @@ public class CarrierConfigManager { public static final String KEY_ADDITIONAL_NR_ADVANCED_BANDS_INT_ARRAY = "additional_nr_advanced_bands_int_array"; + /** + * This configuration allows the framework to control the NR advanced capable by protocol + * configuration options(PCO). + * + * If this config is 0, then the nr advanced capable is enabled. + * If this config is not 0 and PCO container with this config's address is 1, then the nr + * advanced capable is enabled. + * If this config is not 0 and PCO container with this config's address is 0, then the nr + * advanced capable is disabled. + * + * @hide + */ + public static final String KEY_NR_ADVANCED_CAPABLE_PCO_ID_INT = + "nr_advanced_capable_pco_id_int"; + /** * Controls time in milliseconds until DcTracker reevaluates 5G connection state. * @hide @@ -5414,6 +5429,7 @@ public class CarrierConfigManager { /* Default value is 1 hour. */ sDefaults.putLong(KEY_5G_WATCHDOG_TIME_MS_LONG, 3600000); sDefaults.putIntArray(KEY_ADDITIONAL_NR_ADVANCED_BANDS_INT_ARRAY, new int[0]); + sDefaults.putInt(KEY_NR_ADVANCED_CAPABLE_PCO_ID_INT, 0); sDefaults.putBoolean(KEY_UNMETERED_NR_NSA_BOOL, false); sDefaults.putBoolean(KEY_UNMETERED_NR_NSA_MMWAVE_BOOL, false); sDefaults.putBoolean(KEY_UNMETERED_NR_NSA_SUB6_BOOL, false); -- cgit v1.2.3-59-g8ed1b