Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1e3ee547 authored by Sarah Chin's avatar Sarah Chin Committed by Automerger Merge Worker
Browse files

Merge "Add carrier config nr_advanced_capable_pco_id_int" am: e5facf42 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1731572

Change-Id: I37a4fe938a3da5d2a6bb269966882fb64eab9a96
parents 04e5006c e5facf42

telephony/java/android/telephony/CarrierConfigManager.java

+16 −0
Original line number Diff line number Diff line
@@ -3397,6 +3397,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
@@ -4889,6 +4904,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);