diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2018-01-16 21:39:21 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2018-01-16 21:39:21 +0000 |
| commit | 0fd8d88782bb77bf75d53b8ef3754fddfcd08ceb (patch) | |
| tree | e43ae3eb0a8d964f3d0604203cdbe085f57f144d | |
| parent | 2ac6e16504279d8e89675d3ee4be1d343de0b405 (diff) | |
| parent | fd51a3ba00ae4ed2ef8ee0aca84822b9955f7a60 (diff) | |
| download | base-0fd8d88782bb77bf75d53b8ef3754fddfcd08ceb.tar.gz | |
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
| -rw-r--r-- | telephony/java/android/telephony/CarrierConfigManager.java | 14 | ||||
| -rw-r--r-- | telephony/java/android/telephony/TelephonyManager.java | 11 |
2 files changed, 25 insertions, 0 deletions
diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java index 450a0c66d2e9..53e506bd0004 100644 --- a/telephony/java/android/telephony/CarrierConfigManager.java +++ b/telephony/java/android/telephony/CarrierConfigManager.java @@ -331,6 +331,19 @@ public class CarrierConfigManager { "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. * @hide @@ -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); diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java index 011d76b0a545..c9afb9f9ea31 100644 --- a/telephony/java/android/telephony/TelephonyManager.java +++ b/telephony/java/android/telephony/TelephonyManager.java @@ -827,6 +827,17 @@ public class TelephonyManager { "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. * <p> |