Merge "More video related API fixes" into mnc-dev (642737c8) · Commits · e / os / android_frameworks_base

api/current.txt

+8 −9

Original line number	Diff line number	Diff line
		@@ -30169,7 +30169,6 @@ package android.telecom {

		public static abstract class Connection.VideoProvider {
		ctor public Connection.VideoProvider();
		method public void changeCallDataUsage(long);
		method public void changeCameraCapabilities(android.telecom.VideoProfile.CameraCapabilities);
		method public void changePeerDimensions(int, int);
		method public void changeVideoQuality(int);
		@@ -30181,11 +30180,12 @@ package android.telecom {
		method public abstract void onSetCamera(java.lang.String);
		method public abstract void onSetDeviceOrientation(int);
		method public abstract void onSetDisplaySurface(android.view.Surface);
		method public abstract void onSetPauseImage(java.lang.String);
		method public abstract void onSetPauseImage(android.net.Uri);
		method public abstract void onSetPreviewSurface(android.view.Surface);
		method public abstract void onSetZoom(float);
		method public void receiveSessionModifyRequest(android.telecom.VideoProfile);
		method public void receiveSessionModifyResponse(int, android.telecom.VideoProfile, android.telecom.VideoProfile);
		method public void setCallDataUsage(long);
		field public static final int SESSION_EVENT_CAMERA_FAILURE = 5; // 0x5
		field public static final int SESSION_EVENT_CAMERA_READY = 6; // 0x6
		field public static final int SESSION_EVENT_RX_PAUSE = 1; // 0x1
		@@ -30292,7 +30292,7 @@ package android.telecom {
		method public abstract void setCamera(java.lang.String);
		method public abstract void setDeviceOrientation(int);
		method public abstract void setDisplaySurface(android.view.Surface);
		method public abstract void setPauseImage(java.lang.String);
		method public abstract void setPauseImage(android.net.Uri);
		method public abstract void setPreviewSurface(android.view.Surface);
		method public abstract void setZoom(float);
		method public abstract void unregisterCallback(android.telecom.InCallService.VideoCall.Callback);
		@@ -30517,6 +30517,11 @@ package android.telecom {
		field public static final int QUALITY_HIGH = 1; // 0x1
		field public static final int QUALITY_LOW = 3; // 0x3
		field public static final int QUALITY_MEDIUM = 2; // 0x2
		field public static final int STATE_AUDIO_ONLY = 0; // 0x0
		field public static final int STATE_BIDIRECTIONAL = 3; // 0x3
		field public static final int STATE_PAUSED = 4; // 0x4
		field public static final int STATE_RX_ENABLED = 2; // 0x2
		field public static final int STATE_TX_ENABLED = 1; // 0x1
		}

		public static final class VideoProfile.CameraCapabilities implements android.os.Parcelable {
		@@ -30529,18 +30534,12 @@ package android.telecom {
		}

		public static class VideoProfile.VideoState {
		ctor public VideoProfile.VideoState();
		method public static boolean isAudioOnly(int);
		method public static boolean isBidirectional(int);
		method public static boolean isPaused(int);
		method public static boolean isReceptionEnabled(int);
		method public static boolean isTransmissionEnabled(int);
		method public static java.lang.String videoStateToString(int);
		field public static final int AUDIO_ONLY = 0; // 0x0
		field public static final int BIDIRECTIONAL = 3; // 0x3
		field public static final int PAUSED = 4; // 0x4
		field public static final int RX_ENABLED = 2; // 0x2
		field public static final int TX_ENABLED = 1; // 0x1
		}

		}

api/system-current.txt

+8 −9

Original line number	Diff line number	Diff line
		@@ -32303,7 +32303,6 @@ package android.telecom {

		public static abstract class Connection.VideoProvider {
		ctor public Connection.VideoProvider();
		method public void changeCallDataUsage(long);
		method public void changeCameraCapabilities(android.telecom.VideoProfile.CameraCapabilities);
		method public void changePeerDimensions(int, int);
		method public void changeVideoQuality(int);
		@@ -32315,11 +32314,12 @@ package android.telecom {
		method public abstract void onSetCamera(java.lang.String);
		method public abstract void onSetDeviceOrientation(int);
		method public abstract void onSetDisplaySurface(android.view.Surface);
		method public abstract void onSetPauseImage(java.lang.String);
		method public abstract void onSetPauseImage(android.net.Uri);
		method public abstract void onSetPreviewSurface(android.view.Surface);
		method public abstract void onSetZoom(float);
		method public void receiveSessionModifyRequest(android.telecom.VideoProfile);
		method public void receiveSessionModifyResponse(int, android.telecom.VideoProfile, android.telecom.VideoProfile);
		method public void setCallDataUsage(long);
		field public static final int SESSION_EVENT_CAMERA_FAILURE = 5; // 0x5
		field public static final int SESSION_EVENT_CAMERA_READY = 6; // 0x6
		field public static final int SESSION_EVENT_RX_PAUSE = 1; // 0x1
		@@ -32429,7 +32429,7 @@ package android.telecom {
		method public abstract void setCamera(java.lang.String);
		method public abstract void setDeviceOrientation(int);
		method public abstract void setDisplaySurface(android.view.Surface);
		method public abstract void setPauseImage(java.lang.String);
		method public abstract void setPauseImage(android.net.Uri);
		method public abstract void setPreviewSurface(android.view.Surface);
		method public abstract void setZoom(float);
		method public abstract void unregisterCallback(android.telecom.InCallService.VideoCall.Callback);
		@@ -32693,6 +32693,11 @@ package android.telecom {
		field public static final int QUALITY_HIGH = 1; // 0x1
		field public static final int QUALITY_LOW = 3; // 0x3
		field public static final int QUALITY_MEDIUM = 2; // 0x2
		field public static final int STATE_AUDIO_ONLY = 0; // 0x0
		field public static final int STATE_BIDIRECTIONAL = 3; // 0x3
		field public static final int STATE_PAUSED = 4; // 0x4
		field public static final int STATE_RX_ENABLED = 2; // 0x2
		field public static final int STATE_TX_ENABLED = 1; // 0x1
		}

		public static final class VideoProfile.CameraCapabilities implements android.os.Parcelable {
		@@ -32705,18 +32710,12 @@ package android.telecom {
		}

		public static class VideoProfile.VideoState {
		ctor public VideoProfile.VideoState();
		method public static boolean isAudioOnly(int);
		method public static boolean isBidirectional(int);
		method public static boolean isPaused(int);
		method public static boolean isReceptionEnabled(int);
		method public static boolean isTransmissionEnabled(int);
		method public static java.lang.String videoStateToString(int);
		field public static final int AUDIO_ONLY = 0; // 0x0
		field public static final int BIDIRECTIONAL = 3; // 0x3
		field public static final int PAUSED = 4; // 0x4
		field public static final int RX_ENABLED = 2; // 0x2
		field public static final int TX_ENABLED = 1; // 0x1
		}

		}

telecomm/java/android/telecom/Call.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -202,7 +202,7 @@ public final class Call {

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

telecomm/java/android/telecom/Conference.java

+4 −4

Original line number	Diff line number	Diff line
		@@ -366,10 +366,10 @@ public abstract class Conference implements Conferenceable {

		/**
		* Set the video state for the conference.
		* Valid values: {@link VideoProfile.VideoState#AUDIO_ONLY},
		* {@link VideoProfile.VideoState#BIDIRECTIONAL},
		* {@link VideoProfile.VideoState#TX_ENABLED},
		* {@link VideoProfile.VideoState#RX_ENABLED}.
		* Valid values: {@link VideoProfile#STATE_AUDIO_ONLY},
		* {@link VideoProfile#STATE_BIDIRECTIONAL},
		* {@link VideoProfile#STATE_TX_ENABLED},
		* {@link VideoProfile#STATE_RX_ENABLED}.
		*
		* @param videoState The new video state.
		*/

telecomm/java/android/telecom/Connection.java

+30 −13

Original line number	Diff line number	Diff line
		@@ -186,7 +186,7 @@ public abstract class Connection implements Conferenceable {

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

		@@ -484,7 +484,7 @@ public abstract class Connection implements Conferenceable {
		onRequestConnectionDataUsage();
		break;
		case MSG_SET_PAUSE_IMAGE:
		onSetPauseImage((String) msg.obj);
		onSetPauseImage((Uri) msg.obj);
		break;
		default:
		break;
		@@ -547,7 +547,7 @@ public abstract class Connection implements Conferenceable {
		mMessageHandler.obtainMessage(MSG_REQUEST_CONNECTION_DATA_USAGE).sendToTarget();
		}

		public void setPauseImage(String uri) {
		public void setPauseImage(Uri uri) {
		mMessageHandler.obtainMessage(MSG_SET_PAUSE_IMAGE, uri).sendToTarget();
		}
		}
		@@ -642,7 +642,7 @@ public abstract class Connection implements Conferenceable {
		*
		* @param uri URI of image to display.
		*/
		public abstract void onSetPauseImage(String uri);
		public abstract void onSetPauseImage(Uri uri);

		/**
		* Invokes callback method defined in listening {@link InCallService} implementations.
		@@ -726,7 +726,7 @@ public abstract class Connection implements Conferenceable {
		*
		* @param dataUsage The updated data usage.
		*/
		public void changeCallDataUsage(long dataUsage) {
		public void setCallDataUsage(long dataUsage) {
		if (mVideoCallbacks != null) {
		try {
		for (IVideoCallback callback : mVideoCallbacks.values()) {
		@@ -737,6 +737,17 @@ public abstract class Connection implements Conferenceable {
		}
		}

		/**
		* Invokes callback method defined in listening {@link InCallService} implementations.
		*
		* @param dataUsage The updated data usage.
		* @deprecated - Use {@link #setCallDataUsage(long)} instead.
		* @hide
		*/
		public void changeCallDataUsage(long dataUsage) {
		setCallDataUsage(dataUsage);
		}

		/**
		* Invokes callback method defined in listening {@link InCallService} implementations.
		*
		@@ -756,6 +767,12 @@ public abstract class Connection implements Conferenceable {
		/**
		* Invokes callback method defined in listening {@link InCallService} implementations.
		*
		* Allowed values:
		* {@link VideoProfile#QUALITY_HIGH},
		* {@link VideoProfile#QUALITY_MEDIUM},
		* {@link VideoProfile#QUALITY_LOW},
		* {@link VideoProfile#QUALITY_DEFAULT}.
		*
		* @param videoQuality The updated video quality.
		*/
		public void changeVideoQuality(int videoQuality) {
		@@ -859,10 +876,10 @@ public abstract class Connection implements Conferenceable {

		/**
		* Returns the video state of the connection.
		* Valid values: {@link VideoProfile.VideoState#AUDIO_ONLY},
		* {@link VideoProfile.VideoState#BIDIRECTIONAL},
		* {@link VideoProfile.VideoState#TX_ENABLED},
		* {@link VideoProfile.VideoState#RX_ENABLED}.
		* Valid values: {@link VideoProfile#STATE_AUDIO_ONLY},
		* {@link VideoProfile#STATE_BIDIRECTIONAL},
		* {@link VideoProfile#STATE_TX_ENABLED},
		* {@link VideoProfile#STATE_RX_ENABLED}.
		*
		* @return The video state of the connection.
		* @hide
		@@ -1027,10 +1044,10 @@ public abstract class Connection implements Conferenceable {

		/**
		* Set the video state for the connection.
		* Valid values: {@link VideoProfile.VideoState#AUDIO_ONLY},
		* {@link VideoProfile.VideoState#BIDIRECTIONAL},
		* {@link VideoProfile.VideoState#TX_ENABLED},
		* {@link VideoProfile.VideoState#RX_ENABLED}.
		* Valid values: {@link VideoProfile#STATE_AUDIO_ONLY},
		* {@link VideoProfile#STATE_BIDIRECTIONAL},
		* {@link VideoProfile#STATE_TX_ENABLED},
		* {@link VideoProfile#STATE_RX_ENABLED}.
		*
		* @param videoState The new video state.
		*/