Merge "Add carrier config nr_advanced_capable_pco_id_int" into sc-dev

This commit is contained in:
SongFerng Wang
2021-05-11 12:08:19 +00:00
committed by Android (Google) Code Review

View File

@@ -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
@@ -5436,6 +5451,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);