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

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

Merge "Add carrier config for allowing merge of RTT calls" into qt-r1-dev 

am: f84ff34a

Change-Id: I14916ac03825bcfac65208aa2dfda26e7d7b8632
parents 0571fa82 f84ff34a

telephony/java/android/telephony/CarrierConfigManager.java

+9 −0
Original line number Diff line number Diff line
@@ -467,6 +467,14 @@ public class CarrierConfigManager { 
    public static final String KEY_NOTIFY_HANDOVER_VIDEO_FROM_WIFI_TO_LTE_BOOL =

            "notify_handover_video_from_wifi_to_lte_bool";



    /**

     * Flag specifying whether the carrier supports merging a RTT call with a voice call,

     * downgrading the call in the process.

     * @hide

     */

    public static final String KEY_ALLOW_MERGING_RTT_CALLS_BOOL =

             "allow_merging_rtt_calls_bool";



    /**

     * Flag specifying whether the carrier wants to notify the user when a VT call has been handed

     * over from LTE to WIFI.
@@ -3065,6 +3073,7 @@ public class CarrierConfigManager { 
        sDefaults.putBoolean(KEY_CARRIER_VOLTE_AVAILABLE_BOOL, false);

        sDefaults.putBoolean(KEY_CARRIER_VT_AVAILABLE_BOOL, false);

        sDefaults.putBoolean(KEY_NOTIFY_HANDOVER_VIDEO_FROM_WIFI_TO_LTE_BOOL, false);

        sDefaults.putBoolean(KEY_ALLOW_MERGING_RTT_CALLS_BOOL, false);

        sDefaults.putBoolean(KEY_NOTIFY_HANDOVER_VIDEO_FROM_LTE_TO_WIFI_BOOL, false);

        sDefaults.putBoolean(KEY_SUPPORT_DOWNGRADE_VT_TO_AUDIO_BOOL, true);

        sDefaults.putString(KEY_DEFAULT_VM_NUMBER_STRING, "");