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

Commit 63c1d4e8 authored by Allen Su's avatar Allen Su Committed by Automerger Merge Worker
Browse files

Merge "[KDDI] Define carrier config for call forwarding items" am: f7c1dc5a 

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

Change-Id: I153f47181cd6a1052751518e6a9f41b924f6267d
parents 3ae69503 f7c1dc5a

telephony/java/android/telephony/CarrierConfigManager.java

+29 −1
Original line number Diff line number Diff line
@@ -133,7 +133,7 @@ public class CarrierConfigManager { 
     *

     * {@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.

     * removed in the UI.

     *

     * By default this value is true.

     * @hide
@@ -141,6 +141,32 @@ public class CarrierConfigManager { 
    public static final String KEY_CALL_FORWARDING_WHEN_UNREACHABLE_SUPPORTED_BOOL =

            "call_forwarding_when_unreachable_supported_bool";



     /**

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

      *

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

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

      * removed in the UI.

      *

      * By default this value is true.

      * @hide

      */

    public static final String KEY_CALL_FORWARDING_WHEN_UNANSWERED_SUPPORTED_BOOL =

            "call_forwarding_when_unanswered_supported_bool";



     /**

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

      *

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

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

      * removed in the UI.

      *

      * By default this value is true.

      * @hide

      */

    public static final String KEY_CALL_FORWARDING_WHEN_BUSY_SUPPORTED_BOOL =

            "call_forwarding_when_busy_supported_bool";



    /**

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

     * true means visible. false means gone.
@@ -3805,6 +3831,8 @@ public class CarrierConfigManager { 
        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_CALL_FORWARDING_WHEN_UNANSWERED_SUPPORTED_BOOL, true);

        sDefaults.putBoolean(KEY_CALL_FORWARDING_WHEN_BUSY_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_DISABLE_SUPPLEMENTARY_SERVICES_IN_AIRPLANE_MODE_BOOL, false);