Merge "Add support for notification of LTE to WIFI handover for video calls." into oc-mr1-dev (2175e526) · Commits · e / os / android_frameworks_base

telephony/java/android/telephony/CarrierConfigManager.java

+14 −0

Original line number	Diff line number	Diff line
		@@ -336,6 +336,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.
		@@ -1753,6 +1766,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_CONFIG_TELEPHONY_USE_OWN_NUMBER_FOR_VOICEMAIL_BOOL, false);

+11 −0

Original line number	Diff line number	Diff line
		@@ -831,6 +831,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.