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

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

Merge "Add carrier configs for NR SA unmetered" into rvc-dev am: 31354ac5 am: e55e7745 

Change-Id: Ib055b9d5c13e0886f52f44bee1d16c65cf74d44e
parents 396879c2 e55e7745

telephony/java/android/telephony/CarrierConfigManager.java

+25 −0
Original line number Diff line number Diff line
@@ -3073,6 +3073,28 @@ public class CarrierConfigManager { 
     */

    public static final String KEY_UNMETERED_NR_NSA_SUB6_BOOL = "unmetered_nr_nsa_sub6_bool";



    /**

     * Whether NR (standalone) should be unmetered for all frequencies.

     * If either {@link #KEY_UNMETERED_NR_SA_MMWAVE_BOOL} or

     * {@link #KEY_UNMETERED_NR_SA_SUB6_BOOL} are true, then this value will be ignored.

     * @hide

     */

    public static final String KEY_UNMETERED_NR_SA_BOOL = "unmetered_nr_sa_bool";



    /**

     * Whether NR (standalone) frequencies above 6GHz (millimeter wave) should be unmetered.

     * If this is true, then the value for {@link #KEY_UNMETERED_NR_SA_BOOL} will be ignored.

     * @hide

     */

    public static final String KEY_UNMETERED_NR_SA_MMWAVE_BOOL = "unmetered_nr_sa_mmwave_bool";



    /**

     * Whether NR (standalone) frequencies below 6GHz (sub6) should be unmetered.

     * If this is true, then the value for {@link #KEY_UNMETERED_NR_SA_BOOL} will be ignored.

     * @hide

     */

    public static final String KEY_UNMETERED_NR_SA_SUB6_BOOL = "unmetered_nr_sa_sub6_bool";



    /**

     * Support ASCII 7-BIT encoding for long SMS. This carrier config is used to enable

     * this feature.
@@ -4090,6 +4112,9 @@ public class CarrierConfigManager { 
        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);

        sDefaults.putBoolean(KEY_UNMETERED_NR_SA_BOOL, false);

        sDefaults.putBoolean(KEY_UNMETERED_NR_SA_MMWAVE_BOOL, false);

        sDefaults.putBoolean(KEY_UNMETERED_NR_SA_SUB6_BOOL, false);

        sDefaults.putBoolean(KEY_ASCII_7_BIT_SUPPORT_FOR_LONG_MESSAGE_BOOL, false);

        sDefaults.putBoolean(KEY_SHOW_WIFI_CALLING_ICON_IN_STATUS_BAR_BOOL, false);

        /* Default value is minimum RSRP level needed for SIGNAL_STRENGTH_GOOD */