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

Commit 0fd8d887 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Merge cherrypicks of [3463668, 3464926, 3464927, 3464663, 3464895, 3464928,... 

Merge cherrypicks of [3463668, 3464926, 3464927, 3464663, 3464895, 3464928, 3464896, 3464664, 3464665, 3464666, 3464492, 3464456, 3464929, 3465492, 3465473] into oc-m2-release

Change-Id: Id509cbd1072540b4d396afaafb3e9d3fb0248970
parents 2ac6e165 fd51a3ba

telephony/java/android/telephony/CarrierConfigManager.java

+14 −0
Original line number Diff line number Diff line
@@ -330,6 +330,19 @@ 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 wants to notify the user when a VT call has been handed

     * over from LTE to WIFI.

     * <p>

     * The handover notification is sent as a

     * {@link TelephonyManager#EVENT_HANDOVER_VIDEO_FROM_LTE_TO_WIFI}

     * {@link android.telecom.Connection} event, which an {@link android.telecom.InCallService}

     * should use to trigger the display of a user-facing message.

     * @hide

     */

    public static final String KEY_NOTIFY_HANDOVER_VIDEO_FROM_LTE_TO_WIFI_BOOL =

            "notify_handover_video_from_lte_to_wifi_bool";



    /**

     * Flag specifying whether the carrier supports downgrading a video call (tx, rx or tx/rx)

     * directly to an audio call.
@@ -1594,6 +1607,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_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, "");

        sDefaults.putBoolean(KEY_IGNORE_DATA_ENABLED_CHANGED_FOR_VIDEO_CALLS, true);

telephony/java/android/telephony/TelephonyManager.java

+11 −0
Original line number Diff line number Diff line
@@ -826,6 +826,17 @@ public class TelephonyManager { 
    public static final String EVENT_HANDOVER_VIDEO_FROM_WIFI_TO_LTE =

            "android.telephony.event.EVENT_HANDOVER_VIDEO_FROM_WIFI_TO_LTE";



    /**

     * {@link android.telecom.Connection} event used to indicate that an IMS call has be

     * successfully handed over from LTE to WIFI.

     * <p>

     * Sent via {@link android.telecom.Connection#sendConnectionEvent(String, Bundle)}.

     * The {@link Bundle} parameter is expected to be null when this connection event is used.

     * @hide

     */

    public static final String EVENT_HANDOVER_VIDEO_FROM_LTE_TO_WIFI =

            "android.telephony.event.EVENT_HANDOVER_VIDEO_FROM_LTE_TO_WIFI";



    /**

     * {@link android.telecom.Connection} event used to indicate that an IMS call failed to be

     * handed over from LTE to WIFI.