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

Commit f20603af authored by Hall Liu's avatar Hall Liu Committed by android-build-merger
Browse files

Merge "Add a new carrier config that supports no-reply timer of CFNRy" 

am: 833a6276

Change-Id: Ia3eee0ca9efb619b2476075b8d7af173c332fcd4
parents 8a456bad 833a6276

telephony/java/android/telephony/CarrierConfigManager.java

+12 −0
Original line number Diff line number Diff line
@@ -1965,6 +1965,17 @@ public class CarrierConfigManager { 
    public static final String KEY_SKIP_CF_FAIL_TO_DISABLE_DIALOG_BOOL =

            "skip_cf_fail_to_disable_dialog_bool";



    /**

     * Flag specifying whether operator supports including no reply condition timer option on

     * CFNRy (3GPP TS 24.082 3: Call Forwarding on No Reply) in the call forwarding settings UI.

     * {@code true}  - include no reply condition timer option on CFNRy

     * {@code false} - don't include no reply condition timer option on CFNRy

     *

     * @hide

     */

    public static final String KEY_SUPPORT_NO_REPLY_TIMER_FOR_CFNRY_BOOL =

            "support_no_reply_timer_for_cfnry_bool";



    /**

     * List of the FAC (feature access codes) to dial as a normal call.

     * @hide
@@ -2419,6 +2430,7 @@ public class CarrierConfigManager { 
        sDefaults.putBoolean(KEY_SHOW_IMS_REGISTRATION_STATUS_BOOL, false);

        sDefaults.putBoolean(KEY_RTT_SUPPORTED_BOOL, false);

        sDefaults.putBoolean(KEY_DISABLE_CHARGE_INDICATION_BOOL, false);

        sDefaults.putBoolean(KEY_SUPPORT_NO_REPLY_TIMER_FOR_CFNRY_BOOL, true);

        sDefaults.putStringArray(KEY_FEATURE_ACCESS_CODES_STRING_ARRAY, null);

        sDefaults.putBoolean(KEY_IDENTIFY_HIGH_DEFINITION_CALLS_IN_CALL_LOG_BOOL, false);

        sDefaults.putBoolean(KEY_SHOW_PRECISE_FAILED_CAUSE_BOOL, false);