DO NOT MERGE Un-@hiding some missed VT APIs. (2b5b6602) · Commits · e / os / android_frameworks_base

api/current.txt

+17 −0

Original line number	Diff line number	Diff line
		@@ -28449,6 +28449,8 @@ package android.telecom {
		method public android.telecom.Connection getPrimaryConnection();
		method public final int getState();
		method public final android.telecom.StatusHints getStatusHints();
		method public android.telecom.Connection.VideoProvider getVideoProvider();
		method public int getVideoState();
		method public void onAudioStateChanged(android.telecom.AudioState);
		method public void onConnectionAdded(android.telecom.Connection);
		method public void onDisconnect();
		@@ -28468,6 +28470,8 @@ package android.telecom {
		method public final void setDisconnected(android.telecom.DisconnectCause);
		method public final void setOnHold();
		method public final void setStatusHints(android.telecom.StatusHints);
		method public final void setVideoProvider(android.telecom.Connection, android.telecom.Connection.VideoProvider);
		method public final void setVideoState(android.telecom.Connection, int);
		field public static final long CONNECT_TIME_NOT_SPECIFIED = 0L; // 0x0L
		}

		@@ -28492,6 +28496,7 @@ package android.telecom {
		method public final android.telecom.Connection.VideoProvider getVideoProvider();
		method public final boolean isRingbackRequested();
		method public void onAbort();
		method public void onAnswer(int);
		method public void onAnswer();
		method public void onAudioStateChanged(android.telecom.AudioState);
		method public void onDisconnect();
		@@ -28520,7 +28525,11 @@ package android.telecom {
		method public final void setRingbackRequested(boolean);
		method public final void setRinging();
		method public final void setStatusHints(android.telecom.StatusHints);
		method public final void setVideoProvider(android.telecom.Connection.VideoProvider);
		method public final void setVideoState(int);
		method public static java.lang.String stateToString(int);
		field public static final int CAPABILITY_CAN_PAUSE_VIDEO = 1048576; // 0x100000
		field public static final int CAPABILITY_CAN_UPGRADE_TO_VIDEO = 524288; // 0x80000
		field public static final int CAPABILITY_DISCONNECT_FROM_CONFERENCE = 8192; // 0x2000
		field public static final int CAPABILITY_HOLD = 1; // 0x1
		field public static final int CAPABILITY_MANAGE_CONFERENCE = 128; // 0x80
		@@ -28528,6 +28537,12 @@ package android.telecom {
		field public static final int CAPABILITY_MUTE = 64; // 0x40
		field public static final int CAPABILITY_RESPOND_VIA_TEXT = 32; // 0x20
		field public static final int CAPABILITY_SEPARATE_FROM_CONFERENCE = 4096; // 0x1000
		field public static final int CAPABILITY_SUPPORTS_VT_LOCAL_BIDIRECTIONAL = 768; // 0x300
		field public static final int CAPABILITY_SUPPORTS_VT_LOCAL_RX = 256; // 0x100
		field public static final int CAPABILITY_SUPPORTS_VT_LOCAL_TX = 512; // 0x200
		field public static final int CAPABILITY_SUPPORTS_VT_REMOTE_BIDIRECTIONAL = 3072; // 0xc00
		field public static final int CAPABILITY_SUPPORTS_VT_REMOTE_RX = 1024; // 0x400
		field public static final int CAPABILITY_SUPPORTS_VT_REMOTE_TX = 2048; // 0x800
		field public static final int CAPABILITY_SUPPORT_HOLD = 2; // 0x2
		field public static final int CAPABILITY_SWAP_CONFERENCE = 8; // 0x8
		field public static final int STATE_ACTIVE = 4; // 0x4
		@@ -28573,10 +28588,12 @@ package android.telecom {

		public final class ConnectionRequest implements android.os.Parcelable {
		ctor public ConnectionRequest(android.telecom.PhoneAccountHandle, android.net.Uri, android.os.Bundle);
		ctor public ConnectionRequest(android.telecom.PhoneAccountHandle, android.net.Uri, android.os.Bundle, int);
		method public int describeContents();
		method public android.telecom.PhoneAccountHandle getAccountHandle();
		method public android.net.Uri getAddress();
		method public android.os.Bundle getExtras();
		method public int getVideoState();
		method public void writeToParcel(android.os.Parcel, int);
		field public static final android.os.Parcelable.Creator<android.telecom.ConnectionRequest> CREATOR;
		}

api/system-current.txt

+17 −0

Original line number	Diff line number	Diff line
		@@ -30271,6 +30271,8 @@ package android.telecom {
		method public android.telecom.Connection getPrimaryConnection();
		method public final int getState();
		method public final android.telecom.StatusHints getStatusHints();
		method public android.telecom.Connection.VideoProvider getVideoProvider();
		method public int getVideoState();
		method public void onAudioStateChanged(android.telecom.AudioState);
		method public void onConnectionAdded(android.telecom.Connection);
		method public void onDisconnect();
		@@ -30290,6 +30292,8 @@ package android.telecom {
		method public final void setDisconnected(android.telecom.DisconnectCause);
		method public final void setOnHold();
		method public final void setStatusHints(android.telecom.StatusHints);
		method public final void setVideoProvider(android.telecom.Connection, android.telecom.Connection.VideoProvider);
		method public final void setVideoState(android.telecom.Connection, int);
		field public static final long CONNECT_TIME_NOT_SPECIFIED = 0L; // 0x0L
		}

		@@ -30314,6 +30318,7 @@ package android.telecom {
		method public final android.telecom.Connection.VideoProvider getVideoProvider();
		method public final boolean isRingbackRequested();
		method public void onAbort();
		method public void onAnswer(int);
		method public void onAnswer();
		method public void onAudioStateChanged(android.telecom.AudioState);
		method public void onDisconnect();
		@@ -30342,7 +30347,11 @@ package android.telecom {
		method public final void setRingbackRequested(boolean);
		method public final void setRinging();
		method public final void setStatusHints(android.telecom.StatusHints);
		method public final void setVideoProvider(android.telecom.Connection.VideoProvider);
		method public final void setVideoState(int);
		method public static java.lang.String stateToString(int);
		field public static final int CAPABILITY_CAN_PAUSE_VIDEO = 1048576; // 0x100000
		field public static final int CAPABILITY_CAN_UPGRADE_TO_VIDEO = 524288; // 0x80000
		field public static final int CAPABILITY_DISCONNECT_FROM_CONFERENCE = 8192; // 0x2000
		field public static final int CAPABILITY_HOLD = 1; // 0x1
		field public static final int CAPABILITY_MANAGE_CONFERENCE = 128; // 0x80
		@@ -30350,6 +30359,12 @@ package android.telecom {
		field public static final int CAPABILITY_MUTE = 64; // 0x40
		field public static final int CAPABILITY_RESPOND_VIA_TEXT = 32; // 0x20
		field public static final int CAPABILITY_SEPARATE_FROM_CONFERENCE = 4096; // 0x1000
		field public static final int CAPABILITY_SUPPORTS_VT_LOCAL_BIDIRECTIONAL = 768; // 0x300
		field public static final int CAPABILITY_SUPPORTS_VT_LOCAL_RX = 256; // 0x100
		field public static final int CAPABILITY_SUPPORTS_VT_LOCAL_TX = 512; // 0x200
		field public static final int CAPABILITY_SUPPORTS_VT_REMOTE_BIDIRECTIONAL = 3072; // 0xc00
		field public static final int CAPABILITY_SUPPORTS_VT_REMOTE_RX = 1024; // 0x400
		field public static final int CAPABILITY_SUPPORTS_VT_REMOTE_TX = 2048; // 0x800
		field public static final int CAPABILITY_SUPPORT_HOLD = 2; // 0x2
		field public static final int CAPABILITY_SWAP_CONFERENCE = 8; // 0x8
		field public static final int STATE_ACTIVE = 4; // 0x4
		@@ -30395,10 +30410,12 @@ package android.telecom {

		public final class ConnectionRequest implements android.os.Parcelable {
		ctor public ConnectionRequest(android.telecom.PhoneAccountHandle, android.net.Uri, android.os.Bundle);
		ctor public ConnectionRequest(android.telecom.PhoneAccountHandle, android.net.Uri, android.os.Bundle, int);
		method public int describeContents();
		method public android.telecom.PhoneAccountHandle getAccountHandle();
		method public android.net.Uri getAddress();
		method public android.os.Bundle getExtras();
		method public int getVideoState();
		method public void writeToParcel(android.os.Parcel, int);
		field public static final android.os.Parcelable.Creator<android.telecom.ConnectionRequest> CREATOR;
		}

telecomm/java/android/telecom/Conference.java

+0 −4

Original line number	Diff line number	Diff line
		@@ -179,7 +179,6 @@ public abstract class Conference implements IConferenceable {

		/**
		* Returns VideoProvider of the primary call. This can be null.
		* @hide
		*/
		public VideoProvider getVideoProvider() {
		return null;
		@@ -187,7 +186,6 @@ public abstract class Conference implements IConferenceable {

		/**
		* Returns video state of the primary call.
		* @hide
		*/
		public int getVideoState() {
		return VideoProfile.VideoState.AUDIO_ONLY;
		@@ -373,7 +371,6 @@ public abstract class Conference implements IConferenceable {
		* {@link VideoProfile.VideoState#RX_ENABLED}.
		*
		* @param videoState The new video state.
		* @hide
		*/
		public final void setVideoState(Connection c, int videoState) {
		Log.d(this, "setVideoState Conference: %s Connection: %s VideoState: %s",
		@@ -387,7 +384,6 @@ public abstract class Conference implements IConferenceable {
		* Sets the video connection provider.
		*
		* @param videoProvider The video provider.
		* @hide
		*/
		public final void setVideoProvider(Connection c, Connection.VideoProvider videoProvider) {
		Log.d(this, "setVideoProvider Conference: %s Connection: %s VideoState: %s",

telecomm/java/android/telecom/Connection.java

+0 −11

Original line number	Diff line number	Diff line
		@@ -106,38 +106,32 @@ public abstract class Connection implements IConferenceable {

		/**
		* Local device supports receiving video.
		* @hide
		*/
		public static final int CAPABILITY_SUPPORTS_VT_LOCAL_RX = 0x00000100;

		/**
		* Local device supports transmitting video.
		* @hide
		*/
		public static final int CAPABILITY_SUPPORTS_VT_LOCAL_TX = 0x00000200;

		/**
		* Local device supports bidirectional video calling.
		* @hide
		*/
		public static final int CAPABILITY_SUPPORTS_VT_LOCAL_BIDIRECTIONAL =
		CAPABILITY_SUPPORTS_VT_LOCAL_RX \| CAPABILITY_SUPPORTS_VT_LOCAL_TX;

		/**
		* Remote device supports receiving video.
		* @hide
		*/
		public static final int CAPABILITY_SUPPORTS_VT_REMOTE_RX = 0x00000400;

		/**
		* Remote device supports transmitting video.
		* @hide
		*/
		public static final int CAPABILITY_SUPPORTS_VT_REMOTE_TX = 0x00000800;

		/**
		* Remote device supports bidirectional video calling.
		* @hide
		*/
		public static final int CAPABILITY_SUPPORTS_VT_REMOTE_BIDIRECTIONAL =
		CAPABILITY_SUPPORTS_VT_REMOTE_RX \| CAPABILITY_SUPPORTS_VT_REMOTE_TX;
		@@ -187,14 +181,12 @@ public abstract class Connection implements IConferenceable {

		/**
		* Call can be upgraded to a video call.
		* @hide
		*/
		public static final int CAPABILITY_CAN_UPGRADE_TO_VIDEO = 0x00080000;

		/**
		* For video calls, indicates whether the outgoing video for the call can be paused using
		* the {@link android.telecom.VideoProfile.VideoState#PAUSED} VideoState.
		* @hide
		*/
		public static final int CAPABILITY_CAN_PAUSE_VIDEO = 0x00100000;

		@@ -1041,7 +1033,6 @@ public abstract class Connection implements IConferenceable {
		* {@link VideoProfile.VideoState#RX_ENABLED}.
		*
		* @param videoState The new video state.
		* @hide
		*/
		public final void setVideoState(int videoState) {
		checkImmutable();
		@@ -1105,7 +1096,6 @@ public abstract class Connection implements IConferenceable {
		/**
		* Sets the video connection provider.
		* @param videoProvider The video provider.
		* @hide
		*/
		public final void setVideoProvider(VideoProvider videoProvider) {
		checkImmutable();
		@@ -1417,7 +1407,6 @@ public abstract class Connection implements IConferenceable {
		* a request to accept.
		*
		* @param videoState The video state in which to answer the connection.
		* @hide
		*/
		public void onAnswer(int videoState) {}

telecomm/java/android/telecom/ConnectionRequest.java

+0 −2

Original line number	Diff line number	Diff line
		@@ -50,7 +50,6 @@ public final class ConnectionRequest implements Parcelable {
		* @param handle The handle (e.g., phone number) to which the {@link Connection} is to connect.
		* @param extras Application-specific extra data.
		* @param videoState Determines the video state for the connection.
		* @hide
		*/
		public ConnectionRequest(
		PhoneAccountHandle accountHandle,
		@@ -95,7 +94,6 @@ public final class ConnectionRequest implements Parcelable {
		* {@link VideoProfile.VideoState#RX_ENABLED}.
		*
		* @return The video state for the connection.
		* @hide
		*/
		public int getVideoState() {
		return mVideoState;