Merge "Camera2: Hide all the deprecated methods and interfaces" (a8c5bade) · Commits · e / os / android_frameworks_base

api/current.txt

+0 −21

Original line number	Original line	Diff line number	Diff line
	@@ -12426,17 +12426,10 @@ package android.hardware.camera2 {
	}		}

	public abstract class CameraDevice implements java.lang.AutoCloseable {		public abstract class CameraDevice implements java.lang.AutoCloseable {
	method public abstract deprecated int capture(android.hardware.camera2.CaptureRequest, android.hardware.camera2.CameraDevice.CaptureListener, android.os.Handler) throws android.hardware.camera2.CameraAccessException;
	method public abstract deprecated int captureBurst(java.util.List<android.hardware.camera2.CaptureRequest>, android.hardware.camera2.CameraDevice.CaptureListener, android.os.Handler) throws android.hardware.camera2.CameraAccessException;
	method public abstract void close();		method public abstract void close();
	method public abstract deprecated void configureOutputs(java.util.List<android.view.Surface>) throws android.hardware.camera2.CameraAccessException;
	method public abstract android.hardware.camera2.CaptureRequest.Builder createCaptureRequest(int) throws android.hardware.camera2.CameraAccessException;		method public abstract android.hardware.camera2.CaptureRequest.Builder createCaptureRequest(int) throws android.hardware.camera2.CameraAccessException;
	method public abstract void createCaptureSession(java.util.List<android.view.Surface>, android.hardware.camera2.CameraCaptureSession.StateListener, android.os.Handler) throws android.hardware.camera2.CameraAccessException;		method public abstract void createCaptureSession(java.util.List<android.view.Surface>, android.hardware.camera2.CameraCaptureSession.StateListener, android.os.Handler) throws android.hardware.camera2.CameraAccessException;
	method public abstract deprecated void flush() throws android.hardware.camera2.CameraAccessException;
	method public abstract java.lang.String getId();		method public abstract java.lang.String getId();
	method public abstract deprecated int setRepeatingBurst(java.util.List<android.hardware.camera2.CaptureRequest>, android.hardware.camera2.CameraDevice.CaptureListener, android.os.Handler) throws android.hardware.camera2.CameraAccessException;
	method public abstract deprecated int setRepeatingRequest(android.hardware.camera2.CaptureRequest, android.hardware.camera2.CameraDevice.CaptureListener, android.os.Handler) throws android.hardware.camera2.CameraAccessException;
	method public abstract deprecated void stopRepeating() throws android.hardware.camera2.CameraAccessException;
	field public static final int TEMPLATE_MANUAL = 6; // 0x6		field public static final int TEMPLATE_MANUAL = 6; // 0x6
	field public static final int TEMPLATE_PREVIEW = 1; // 0x1		field public static final int TEMPLATE_PREVIEW = 1; // 0x1
	field public static final int TEMPLATE_RECORD = 3; // 0x3		field public static final int TEMPLATE_RECORD = 3; // 0x3
	@@ -12445,26 +12438,12 @@ package android.hardware.camera2 {
	field public static final int TEMPLATE_ZERO_SHUTTER_LAG = 5; // 0x5		field public static final int TEMPLATE_ZERO_SHUTTER_LAG = 5; // 0x5
	}		}

	public static abstract deprecated class CameraDevice.CaptureListener {
	ctor public CameraDevice.CaptureListener();
	method public void onCaptureCompleted(android.hardware.camera2.CameraDevice, android.hardware.camera2.CaptureRequest, android.hardware.camera2.TotalCaptureResult);
	method public void onCaptureFailed(android.hardware.camera2.CameraDevice, android.hardware.camera2.CaptureRequest, android.hardware.camera2.CaptureFailure);
	method public void onCaptureProgressed(android.hardware.camera2.CameraDevice, android.hardware.camera2.CaptureRequest, android.hardware.camera2.CaptureResult);
	method public void onCaptureSequenceAborted(android.hardware.camera2.CameraDevice, int);
	method public void onCaptureSequenceCompleted(android.hardware.camera2.CameraDevice, int, long);
	method public void onCaptureStarted(android.hardware.camera2.CameraDevice, android.hardware.camera2.CaptureRequest, long);
	}

	public static abstract class CameraDevice.StateListener {		public static abstract class CameraDevice.StateListener {
	ctor public CameraDevice.StateListener();		ctor public CameraDevice.StateListener();
	method public deprecated void onActive(android.hardware.camera2.CameraDevice);
	method public deprecated void onBusy(android.hardware.camera2.CameraDevice);
	method public void onClosed(android.hardware.camera2.CameraDevice);		method public void onClosed(android.hardware.camera2.CameraDevice);
	method public abstract void onDisconnected(android.hardware.camera2.CameraDevice);		method public abstract void onDisconnected(android.hardware.camera2.CameraDevice);
	method public abstract void onError(android.hardware.camera2.CameraDevice, int);		method public abstract void onError(android.hardware.camera2.CameraDevice, int);
	method public deprecated void onIdle(android.hardware.camera2.CameraDevice);
	method public abstract void onOpened(android.hardware.camera2.CameraDevice);		method public abstract void onOpened(android.hardware.camera2.CameraDevice);
	method public deprecated void onUnconfigured(android.hardware.camera2.CameraDevice);
	field public static final int ERROR_CAMERA_DEVICE = 4; // 0x4		field public static final int ERROR_CAMERA_DEVICE = 4; // 0x4
	field public static final int ERROR_CAMERA_DISABLED = 3; // 0x3		field public static final int ERROR_CAMERA_DISABLED = 3; // 0x3
	field public static final int ERROR_CAMERA_IN_USE = 1; // 0x1		field public static final int ERROR_CAMERA_IN_USE = 1; // 0x1

core/java/android/hardware/camera2/CameraCaptureSession.java

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -660,8 +660,8 @@ public abstract class CameraCaptureSession implements AutoCloseable {
	*		*
	* <p>Due to the asynchronous nature of the camera device, not all submitted captures		* <p>Due to the asynchronous nature of the camera device, not all submitted captures
	* are immediately processed. It is possible to clear out the pending requests		* are immediately processed. It is possible to clear out the pending requests
	* by a variety of operations such as {@link CameraDevice#stopRepeating} or		* by a variety of operations such as {@link CameraCaptureSession#stopRepeating} or
	* {@link CameraDevice#flush}. When such an event happens,		* {@link CameraCaptureSession#abortCaptures}. When such an event happens,
	* {@link #onCaptureSequenceCompleted} will not be called.</p>		* {@link #onCaptureSequenceCompleted} will not be called.</p>
	*		*
	* <p>The default implementation does nothing.</p>		* <p>The default implementation does nothing.</p>

core/java/android/hardware/camera2/CameraDevice.java

+12 −0

Original line number	Original line	Diff line number	Diff line
	@@ -133,6 +133,7 @@ public abstract class CameraDevice implements AutoCloseable {
	* <p>Set up a new output set of Surfaces for the camera device.</p>		* <p>Set up a new output set of Surfaces for the camera device.</p>
	*		*
	* @deprecated Use {@link #createCaptureSession} instead		* @deprecated Use {@link #createCaptureSession} instead
			* @hide
	*/		*/
	@Deprecated		@Deprecated
	public abstract void configureOutputs(List<Surface> outputs) throws CameraAccessException;		public abstract void configureOutputs(List<Surface> outputs) throws CameraAccessException;
	@@ -278,6 +279,7 @@ public abstract class CameraDevice implements AutoCloseable {
	* <p>Submit a request for an image to be captured by this CameraDevice.</p>		* <p>Submit a request for an image to be captured by this CameraDevice.</p>
	*		*
	* @deprecated Use {@link CameraCaptureSession#capture} instead		* @deprecated Use {@link CameraCaptureSession#capture} instead
			* @hide
	*/		*/
	@Deprecated		@Deprecated
	public abstract int capture(CaptureRequest request, CaptureListener listener, Handler handler)		public abstract int capture(CaptureRequest request, CaptureListener listener, Handler handler)
	@@ -287,6 +289,7 @@ public abstract class CameraDevice implements AutoCloseable {
	* Submit a list of requests to be captured in sequence as a burst.		* Submit a list of requests to be captured in sequence as a burst.
	*		*
	* @deprecated Use {@link CameraCaptureSession#captureBurst} instead		* @deprecated Use {@link CameraCaptureSession#captureBurst} instead
			* @hide
	*/		*/
	@Deprecated		@Deprecated
	public abstract int captureBurst(List<CaptureRequest> requests, CaptureListener listener,		public abstract int captureBurst(List<CaptureRequest> requests, CaptureListener listener,
	@@ -296,6 +299,7 @@ public abstract class CameraDevice implements AutoCloseable {
	* Request endlessly repeating capture of images by this CameraDevice.		* Request endlessly repeating capture of images by this CameraDevice.
	*		*
	* @deprecated Use {@link CameraCaptureSession#setRepeatingRequest} instead		* @deprecated Use {@link CameraCaptureSession#setRepeatingRequest} instead
			* @hide
	*/		*/
	@Deprecated		@Deprecated
	public abstract int setRepeatingRequest(CaptureRequest request, CaptureListener listener,		public abstract int setRepeatingRequest(CaptureRequest request, CaptureListener listener,
	@@ -306,6 +310,7 @@ public abstract class CameraDevice implements AutoCloseable {
	* CameraDevice.</p>		* CameraDevice.</p>
	*		*
	* @deprecated Use {@link CameraCaptureSession#setRepeatingBurst} instead		* @deprecated Use {@link CameraCaptureSession#setRepeatingBurst} instead
			* @hide
	*/		*/
	@Deprecated		@Deprecated
	public abstract int setRepeatingBurst(List<CaptureRequest> requests, CaptureListener listener,		public abstract int setRepeatingBurst(List<CaptureRequest> requests, CaptureListener listener,
	@@ -317,6 +322,7 @@ public abstract class CameraDevice implements AutoCloseable {
	* {@link #setRepeatingBurst}.		* {@link #setRepeatingBurst}.
	*		*
	* @deprecated Use {@link CameraCaptureSession#stopRepeating} instead		* @deprecated Use {@link CameraCaptureSession#stopRepeating} instead
			* @hide
	*/		*/
	@Deprecated		@Deprecated
	public abstract void stopRepeating() throws CameraAccessException;		public abstract void stopRepeating() throws CameraAccessException;
	@@ -326,6 +332,7 @@ public abstract class CameraDevice implements AutoCloseable {
	* possible.		* possible.
	*		*
	* @deprecated Use {@link CameraCaptureSession#abortCaptures} instead		* @deprecated Use {@link CameraCaptureSession#abortCaptures} instead
			* @hide
	*/		*/
	@Deprecated		@Deprecated
	public abstract void flush() throws CameraAccessException;		public abstract void flush() throws CameraAccessException;
	@@ -353,6 +360,7 @@ public abstract class CameraDevice implements AutoCloseable {
	* submitted to the camera device.</p>		* submitted to the camera device.</p>
	*		*
	* @deprecated Use {@link CameraCaptureSession.CaptureListener} instead		* @deprecated Use {@link CameraCaptureSession.CaptureListener} instead
			* @hide
	*/		*/
	@Deprecated		@Deprecated
	public static abstract class CaptureListener {		public static abstract class CaptureListener {
	@@ -537,6 +545,7 @@ public abstract class CameraDevice implements AutoCloseable {
	* The method called when a camera device has no outputs configured.		* The method called when a camera device has no outputs configured.
	*		*
	* @deprecated Use {@link #onOpened} instead.		* @deprecated Use {@link #onOpened} instead.
			* @hide
	*/		*/
	@Deprecated		@Deprecated
	public void onUnconfigured(CameraDevice camera) {		public void onUnconfigured(CameraDevice camera) {
	@@ -548,6 +557,7 @@ public abstract class CameraDevice implements AutoCloseable {
	* {@link CaptureRequest capture requests}.		* {@link CaptureRequest capture requests}.
	*		*
	* @deprecated Use {@link CameraCaptureSession.StateListener#onActive} instead.		* @deprecated Use {@link CameraCaptureSession.StateListener#onActive} instead.
			* @hide
	*/		*/
	@Deprecated		@Deprecated
	public void onActive(CameraDevice camera) {		public void onActive(CameraDevice camera) {
	@@ -558,6 +568,7 @@ public abstract class CameraDevice implements AutoCloseable {
	* The method called when a camera device is busy.		* The method called when a camera device is busy.
	*		*
	* @deprecated Use {@link CameraCaptureSession.StateListener#onConfigured} instead.		* @deprecated Use {@link CameraCaptureSession.StateListener#onConfigured} instead.
			* @hide
	*/		*/
	@Deprecated		@Deprecated
	public void onBusy(CameraDevice camera) {		public void onBusy(CameraDevice camera) {
	@@ -584,6 +595,7 @@ public abstract class CameraDevice implements AutoCloseable {
	* submitted capture requests and has reached an idle state.		* submitted capture requests and has reached an idle state.
	*		*
	* @deprecated Use {@link CameraCaptureSession.StateListener#onReady} instead.		* @deprecated Use {@link CameraCaptureSession.StateListener#onReady} instead.
			* @hide
	*/		*/
	@Deprecated		@Deprecated
	public void onIdle(CameraDevice camera) {		public void onIdle(CameraDevice camera) {

core/java/android/hardware/camera2/CaptureFailure.java

+4 −3

Original line number	Original line	Diff line number	Diff line
	@@ -36,7 +36,8 @@ public class CaptureFailure {
	public static final int REASON_ERROR = 0;		public static final int REASON_ERROR = 0;

	/**		/**
	* The capture has failed due to a {@link CameraDevice#flush} call from the application.		* The capture has failed due to a {@link CameraCaptureSession#abortCaptures} call from the
			* application.
	*		*
	* @see #getReason()		* @see #getReason()
	*/		*/
	@@ -64,7 +65,7 @@ public class CaptureFailure {
	* Get the request associated with this failed capture.		* Get the request associated with this failed capture.
	*		*
	* <p>Whenever a request is unsuccessfully captured, with		* <p>Whenever a request is unsuccessfully captured, with
	* {@link CameraDevice.CaptureListener#onCaptureFailed},		* {@link CameraCaptureSession.CaptureListener#onCaptureFailed},
	* the {@code failed capture}'s {@code getRequest()} will return that {@code request}.		* the {@code failed capture}'s {@code getRequest()} will return that {@code request}.
	* </p>		* </p>
	*		*
	@@ -127,7 +128,7 @@ public class CaptureFailure {

	/**		/**
	* The sequence ID for this failed capture that was returned by the		* The sequence ID for this failed capture that was returned by the
	* {@link CameraDevice#capture} family of functions.		* {@link CameraCaptureSession#capture} family of functions.
	*		*
	* <p>The sequence ID is a unique monotonically increasing value starting from 0,		* <p>The sequence ID is a unique monotonically increasing value starting from 0,
	* incremented every time a new group of requests is submitted to the CameraDevice.</p>		* incremented every time a new group of requests is submitted to the CameraDevice.</p>

core/java/android/hardware/camera2/CaptureRequest.java

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -245,7 +245,7 @@ public final class CaptureRequest extends CameraMetadata<CaptureRequest.Key<?>>
	* <p>This tag is not used for anything by the camera device, but can be		* <p>This tag is not used for anything by the camera device, but can be
	* used by an application to easily identify a CaptureRequest when it is		* used by an application to easily identify a CaptureRequest when it is
	* returned by		* returned by
	* {@link CameraDevice.CaptureListener#onCaptureCompleted CaptureListener.onCaptureCompleted}		* {@link CameraCaptureSession.CaptureListener#onCaptureCompleted CaptureListener.onCaptureCompleted}
	* </p>		* </p>
	*		*
	* @return the last tag Object set on this request, or {@code null} if		* @return the last tag Object set on this request, or {@code null} if
	@@ -435,7 +435,7 @@ public final class CaptureRequest extends CameraMetadata<CaptureRequest.Key<?>>
	* <p>This tag is not used for anything by the camera device, but can be		* <p>This tag is not used for anything by the camera device, but can be
	* used by an application to easily identify a CaptureRequest when it is		* used by an application to easily identify a CaptureRequest when it is
	* returned by		* returned by
	* {@link CameraDevice.CaptureListener#onCaptureCompleted CaptureListener.onCaptureCompleted}		* {@link CameraCaptureSession.CaptureListener#onCaptureCompleted CaptureListener.onCaptureCompleted}
	*		*
	* @param tag an arbitrary Object to store with this request		* @param tag an arbitrary Object to store with this request
	* @see CaptureRequest#getTag		* @see CaptureRequest#getTag