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

Commit d3db069b authored by Chuck Liao's avatar Chuck Liao Committed by android-build-merger
Browse files

Merge "Add a new carrier config to support emergency dialer shortcut feature."... 

Merge "Add a new carrier config to support emergency dialer shortcut feature." am: c85fa547 am: 79c683e6
am: d4ff51dd

Change-Id: I126946625f0c953ef3d0ba83b7889b81ed44cbb2
parents 2e007654 d4ff51dd

telephony/java/android/telephony/CarrierConfigManager.java

+8 −0
Original line number Original line Diff line number Diff line
@@ -2238,6 +2238,13 @@ public class CarrierConfigManager { 
    public static final String KEY_SUPPORT_CLIR_NETWORK_DEFAULT_BOOL =

    public static final String KEY_SUPPORT_CLIR_NETWORK_DEFAULT_BOOL =

            "support_clir_network_default_bool";

            "support_clir_network_default_bool";





    /**

     * Determines whether the carrier want to support emergency dialer shortcut.

     * @hide

     */

    public static final String KEY_SUPPORT_EMERGENCY_DIALER_SHORTCUT_BOOL =

            "support_emergency_dialer_shortcut_bool";



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

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

    private final static PersistableBundle sDefaults;

    private final static PersistableBundle sDefaults;
@@ -2587,6 +2594,7 @@ public class CarrierConfigManager { 
        sDefaults.putBoolean(KEY_CALLER_ID_OVER_UT_WARNING_BOOL, false);

        sDefaults.putBoolean(KEY_CALLER_ID_OVER_UT_WARNING_BOOL, false);

        sDefaults.putBoolean(KEY_CALL_WAITING_OVER_UT_WARNING_BOOL, false);

        sDefaults.putBoolean(KEY_CALL_WAITING_OVER_UT_WARNING_BOOL, false);

        sDefaults.putBoolean(KEY_SUPPORT_CLIR_NETWORK_DEFAULT_BOOL, true);

        sDefaults.putBoolean(KEY_SUPPORT_CLIR_NETWORK_DEFAULT_BOOL, true);

        sDefaults.putBoolean(KEY_SUPPORT_EMERGENCY_DIALER_SHORTCUT_BOOL, true);

    }

    }





    /**

    /**