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

Commit 02739712 authored by Gary Jian's avatar Gary Jian Committed by Android (Google) Code Review
Browse files

Merge "Add new carrier config to record the default preference setting"

parents cba1edbc 9e19af0d

core/api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -41912,6 +41912,7 @@ package android.telephony { 
    field public static final String KEY_VOICE_PRIVACY_DISABLE_UI_BOOL = "voice_privacy_disable_ui_bool";

    field public static final String KEY_VOLTE_REPLACEMENT_RAT_INT = "volte_replacement_rat_int";

    field public static final String KEY_VONR_ENABLED_BOOL = "vonr_enabled_bool";

    field public static final String KEY_VONR_ON_BY_DEFAULT_BOOL = "vonr_on_by_default_bool";

    field public static final String KEY_VONR_SETTING_VISIBILITY_BOOL = "vonr_setting_visibility_bool";

    field public static final String KEY_VT_UPGRADE_SUPPORTED_FOR_DOWNGRADED_RTT_CALL_BOOL = "vt_upgrade_supported_for_downgraded_rtt_call";

    field public static final String KEY_VVM_CELLULAR_DATA_REQUIRED_BOOL = "vvm_cellular_data_required_bool";

telephony/java/android/telephony/CarrierConfigManager.java

+10 −0
Original line number Diff line number Diff line
@@ -8697,6 +8697,15 @@ public class CarrierConfigManager { 
     */

    public static final String KEY_VONR_ENABLED_BOOL = "vonr_enabled_bool";



    /**

     * Boolean indicating the default VoNR user preference setting.

     * If true, the VoNR setting will be enabled. If false, it will be disabled initially.

     *

     * Enabled by default.

     *

     */

    public static final String KEY_VONR_ON_BY_DEFAULT_BOOL = "vonr_on_by_default_bool";



    /**

     * Determine whether unthrottle data retry when tracking area code (TAC/LAC) from cell changes

     *
@@ -9520,6 +9529,7 @@ public class CarrierConfigManager { 
        sDefaults.putBoolean(KEY_UNTHROTTLE_DATA_RETRY_WHEN_TAC_CHANGES_BOOL, false);

        sDefaults.putBoolean(KEY_VONR_SETTING_VISIBILITY_BOOL, true);

        sDefaults.putBoolean(KEY_VONR_ENABLED_BOOL, false);

        sDefaults.putBoolean(KEY_VONR_ON_BY_DEFAULT_BOOL, true);

        sDefaults.putIntArray(KEY_SUPPORTED_PREMIUM_CAPABILITIES_INT_ARRAY, new int[] {});

        sDefaults.putLong(KEY_PREMIUM_CAPABILITY_NOTIFICATION_DISPLAY_TIMEOUT_MILLIS_LONG,

                TimeUnit.MINUTES.toMillis(30));