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

Commit a075d028 authored by Jordan Liu's avatar Jordan Liu Committed by android-build-merger
Browse files

Merge "Add carrier config KEY_CALL_FORWARDING_WHEN_UNREACHABLE_SUPPORTED_BOOL"... 

Merge "Add carrier config KEY_CALL_FORWARDING_WHEN_UNREACHABLE_SUPPORTED_BOOL" am: be83f253 am: 66716339
am: 4fdf765e

Change-Id: I2d39f9a6377c532b58c0d17847e8f3e9f0d4e03b
parents cd1787c5 4fdf765e

telephony/java/android/telephony/CarrierConfigManager.java

+14 −0
Original line number Diff line number Diff line
@@ -107,6 +107,19 @@ public class CarrierConfigManager { 
    public static final String KEY_CALL_FORWARDING_VISIBILITY_BOOL =

            "call_forwarding_visibility_bool";



    /**

     * Boolean indicating if carrier supports call forwarding option "When unreachable".

     *

     * {@code true}: Call forwarding option "When unreachable" is supported.

     * {@code false}: Call forwarding option "When unreachable" is not supported. Option will be

     * greyed out in the UI.

     *

     * By default this value is true.

     * @hide

     */

    public static final String KEY_CALL_FORWARDING_WHEN_UNREACHABLE_SUPPORTED_BOOL =

            "call_forwarding_when_unreachable_supported_bool";



    /**

     * Boolean indicating if the "Caller ID" item is visible in the Additional Settings menu.

     * true means visible. false means gone.
@@ -3244,6 +3257,7 @@ public class CarrierConfigManager { 
        sDefaults.putBoolean(KEY_CALL_BARRING_SUPPORTS_PASSWORD_CHANGE_BOOL, true);

        sDefaults.putBoolean(KEY_CALL_BARRING_SUPPORTS_DEACTIVATE_ALL_BOOL, true);

        sDefaults.putBoolean(KEY_CALL_FORWARDING_VISIBILITY_BOOL, true);

        sDefaults.putBoolean(KEY_CALL_FORWARDING_WHEN_UNREACHABLE_SUPPORTED_BOOL, true);

        sDefaults.putBoolean(KEY_ADDITIONAL_SETTINGS_CALLER_ID_VISIBILITY_BOOL, true);

        sDefaults.putBoolean(KEY_ADDITIONAL_SETTINGS_CALL_WAITING_VISIBILITY_BOOL, true);

        sDefaults.putBoolean(KEY_IGNORE_SIM_NETWORK_LOCKED_EVENTS_BOOL, false);