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

Commit 439f16d4 authored by DongYuchen's avatar DongYuchen Committed by takeshi tanigawa
Browse files

Add config to skip showing CF fail-to-disable dialog 

Add config to skip showing CF fail-to-disable dialog. Because it is not
always correct to show fail-to-disable dialog. It depends on the way
of NW CF handling. The default value is set to false.

Test: manual - checked the call forwarding fail dialog was not shown
Bug: 35790386
Change-Id: I8b0e3d15736d95df8fcac205cb9a3ef2f8579988
parent b9f49e67

telephony/java/android/telephony/CarrierConfigManager.java

+13 −0
Original line number Diff line number Diff line
@@ -1530,6 +1530,18 @@ public class CarrierConfigManager { 
    public static final String KEY_DISABLE_CHARGE_INDICATION_BOOL =

            "disable_charge_indication_bool";



    /**

     * Boolean indicating whether to skip the call forwarding (CF) fail-to-disable dialog.

     * The logic used to determine whether we succeeded in disabling is carrier specific,

     * so the dialog may not always be accurate.

     * {@code false} - show CF fail-to-disable dialog.

     * {@code true}  - skip showing CF fail-to-disable dialog.

     *

     * @hide

     */

    public static final String KEY_SKIP_CF_FAIL_TO_DISABLE_DIALOG_BOOL =

            "skip_cf_fail_to_disable_dialog_bool";



    /** The default value for every variable. */

    private final static PersistableBundle sDefaults;
@@ -1683,6 +1695,7 @@ public class CarrierConfigManager { 
        sDefaults.putString(KEY_CARRIER_NAME_STRING, "");

        sDefaults.putBoolean(KEY_SUPPORT_DIRECT_FDN_DIALING_BOOL, false);

        sDefaults.putBoolean(KEY_CARRIER_DEFAULT_DATA_ROAMING_ENABLED_BOOL, false);

        sDefaults.putBoolean(KEY_SKIP_CF_FAIL_TO_DISABLE_DIALOG_BOOL, false);



        // MMS defaults

        sDefaults.putBoolean(KEY_MMS_ALIAS_ENABLED_BOOL, false);