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

Commit 1d010fba authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

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

Merge "Add new carrier config to record the default preference setting" into tm-qpr-dev am: 7e909b60

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



Change-Id: Id572bfa30a94713f70490a254326c1328cbc2a41
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 574a947d 7e909b60

telephony/java/android/telephony/CarrierConfigManager.java

+11 −0
Original line number Diff line number Diff line
@@ -8560,6 +8560,16 @@ 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.

     *

     * @hide

     */

    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

     *
@@ -9253,6 +9263,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.putStringArray(KEY_IWLAN_HANDOVER_POLICY_STRING_ARRAY, new String[]{

                "source=GERAN|UTRAN|EUTRAN|NGRAN|IWLAN, "

                        + "target=GERAN|UTRAN|EUTRAN|NGRAN|IWLAN, type=allowed"});