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

Commit 5459a593 authored by Greg Piecyk's avatar Greg Piecyk Committed by Android (Google) Code Review
Browse files

Merge "Add KEY_ALLOW_HOLD_IN_RTT_CALL_BOOL to Carrier Config." into main

parents 7eee58f2 602231da

core/api/current.txt

+1 −0
Original line number Original line Diff line number Diff line
@@ -45405,6 +45405,7 @@ package android.telephony { 
    field public static final String KEY_ALLOW_EMERGENCY_NUMBERS_IN_CALL_LOG_BOOL = "allow_emergency_numbers_in_call_log_bool";

    field public static final String KEY_ALLOW_EMERGENCY_NUMBERS_IN_CALL_LOG_BOOL = "allow_emergency_numbers_in_call_log_bool";

    field public static final String KEY_ALLOW_EMERGENCY_VIDEO_CALLS_BOOL = "allow_emergency_video_calls_bool";

    field public static final String KEY_ALLOW_EMERGENCY_VIDEO_CALLS_BOOL = "allow_emergency_video_calls_bool";

    field public static final String KEY_ALLOW_HOLD_CALL_DURING_EMERGENCY_BOOL = "allow_hold_call_during_emergency_bool";

    field public static final String KEY_ALLOW_HOLD_CALL_DURING_EMERGENCY_BOOL = "allow_hold_call_during_emergency_bool";

    field @FlaggedApi("com.android.internal.telephony.flags.enable_rtt_hold_carrier_config") public static final String KEY_ALLOW_HOLD_IN_RTT_CALL_BOOL = "allow_hold_in_rtt_call_bool";

    field public static final String KEY_ALLOW_HOLD_VIDEO_CALL_BOOL = "allow_hold_video_call_bool";

    field public static final String KEY_ALLOW_HOLD_VIDEO_CALL_BOOL = "allow_hold_video_call_bool";

    field public static final String KEY_ALLOW_LOCAL_DTMF_TONES_BOOL = "allow_local_dtmf_tones_bool";

    field public static final String KEY_ALLOW_LOCAL_DTMF_TONES_BOOL = "allow_local_dtmf_tones_bool";

    field public static final String KEY_ALLOW_MERGE_WIFI_CALLS_WHEN_VOWIFI_OFF_BOOL = "allow_merge_wifi_calls_when_vowifi_off_bool";

    field public static final String KEY_ALLOW_MERGE_WIFI_CALLS_WHEN_VOWIFI_OFF_BOOL = "allow_merge_wifi_calls_when_vowifi_off_bool";

telephony/java/android/telephony/CarrierConfigManager.java

+11 −0
Original line number Original line Diff line number Diff line
@@ -2445,6 +2445,16 @@ public class CarrierConfigManager { 
    public static final String KEY_ALLOW_HOLD_CALL_DURING_EMERGENCY_BOOL =

    public static final String KEY_ALLOW_HOLD_CALL_DURING_EMERGENCY_BOOL =

            "allow_hold_call_during_emergency_bool";

            "allow_hold_call_during_emergency_bool";




















    /**














     * Flag indicating whether RTT (Real-Time Text) calls support the hold/unhold capability. If














     * false, the hold capability will be disabled for RTT calls. If true, RTT hold capability is














     * determined by IMS service capabilities.














     *














     * The default value is {@code true}.














     */














    @FlaggedApi(Flags.FLAG_ENABLE_RTT_HOLD_CARRIER_CONFIG)














    public static final String KEY_ALLOW_HOLD_IN_RTT_CALL_BOOL = "allow_hold_in_rtt_call_bool";
























    /**







    /**











     * Flag indicating whether or not the carrier supports the periodic exchange of phone numbers







     * Flag indicating whether or not the carrier supports the periodic exchange of phone numbers











     * in the user's address book with the carrier's presence server in order to retrieve the RCS







     * in the user's address book with the carrier's presence server in order to retrieve the RCS










@@ -11157,6 +11167,7 @@ public class CarrierConfigManager {









        sDefaults.putBoolean(KEY_ALLOW_NON_EMERGENCY_CALLS_IN_ECM_BOOL, true);







        sDefaults.putBoolean(KEY_ALLOW_NON_EMERGENCY_CALLS_IN_ECM_BOOL, true);











        sDefaults.putInt(KEY_EMERGENCY_SMS_MODE_TIMER_MS_INT, 0);







        sDefaults.putInt(KEY_EMERGENCY_SMS_MODE_TIMER_MS_INT, 0);











        sDefaults.putBoolean(KEY_ALLOW_HOLD_CALL_DURING_EMERGENCY_BOOL, true);







        sDefaults.putBoolean(KEY_ALLOW_HOLD_CALL_DURING_EMERGENCY_BOOL, true);














        sDefaults.putBoolean(KEY_ALLOW_HOLD_IN_RTT_CALL_BOOL, true);











        sDefaults.putBoolean(KEY_USE_RCS_PRESENCE_BOOL, false);







        sDefaults.putBoolean(KEY_USE_RCS_PRESENCE_BOOL, false);











        sDefaults.putBoolean(KEY_USE_RCS_SIP_OPTIONS_BOOL, false);







        sDefaults.putBoolean(KEY_USE_RCS_SIP_OPTIONS_BOOL, false);











        sDefaults.putBoolean(KEY_FORCE_IMEI_BOOL, false);







        sDefaults.putBoolean(KEY_FORCE_IMEI_BOOL, false);