Merge "Camera2: Clean up some obsolete trampolines left from original API launch" (cb79495d) · Commits · e / os / android_frameworks_base

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

+0 −24

Original line number	Diff line number	Diff line
		@@ -763,13 +763,6 @@ public abstract class CameraCaptureSession implements AutoCloseable {
		}
		}

		/**
		* Temporary for migrating to Callback naming
		* @hide
		*/
		public static abstract class StateListener extends StateCallback {
		}

		/**
		* <p>A callback object for tracking the progress of a {@link CaptureRequest} submitted to the
		* camera device.</p>
		@@ -835,16 +828,6 @@ public abstract class CameraCaptureSession implements AutoCloseable {
		*/
		public void onCaptureStarted(@NonNull CameraCaptureSession session,
		@NonNull CaptureRequest request, long timestamp, long frameNumber) {
		// Temporary trampoline for API change transition
		onCaptureStarted(session, request, timestamp);
		}

		/**
		* Temporary for API change transition
		* @hide
		*/
		public void onCaptureStarted(CameraCaptureSession session,
		CaptureRequest request, long timestamp) {
		// default empty implementation
		}

		@@ -1064,11 +1047,4 @@ public abstract class CameraCaptureSession implements AutoCloseable {
		}
		}

		/**
		* Temporary for migrating to Callback naming
		* @hide
		*/
		public static abstract class CaptureListener extends CaptureCallback {
		}

		}

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

+4 −11

Original line number	Diff line number	Diff line
		@@ -239,9 +239,9 @@ public abstract class CameraDevice implements AutoCloseable {
		* <p>If a prior CameraCaptureSession already exists when this method is called, the previous
		* session will no longer be able to accept new capture requests and will be closed. Any
		* in-progress capture requests made on the prior session will be completed before it's closed.
		* {@link CameraCaptureSession.StateListener#onConfigured} for the new session may be invoked
		* before {@link CameraCaptureSession.StateListener#onClosed} is invoked for the prior
		* session. Once the new session is {@link CameraCaptureSession.StateListener#onConfigured
		* {@link CameraCaptureSession.StateCallback#onConfigured} for the new session may be invoked
		* before {@link CameraCaptureSession.StateCallback#onClosed} is invoked for the prior
		* session. Once the new session is {@link CameraCaptureSession.StateCallback#onConfigured
		* configured}, it is able to start capturing its own requests. To minimize the transition time,
		* the {@link CameraCaptureSession#abortCaptures} call can be used to discard the remaining
		* requests for the prior capture session before a new one is created. Note that once the new
		@@ -265,7 +265,7 @@ public abstract class CameraDevice implements AutoCloseable {
		* but the camera device won't meet the frame rate guarantees as described in
		* {@link StreamConfigurationMap#getOutputMinFrameDuration}. Or third, if the output set
		* cannot be used at all, session creation will fail entirely, with
		* {@link CameraCaptureSession.StateListener#onConfigureFailed} being invoked.</p>
		* {@link CameraCaptureSession.StateCallback#onConfigureFailed} being invoked.</p>
		*
		* <p>For the type column, {@code PRIV} refers to any target whose available sizes are found
		* using {@link StreamConfigurationMap#getOutputSizes(Class)} with no direct application-visible
		@@ -983,13 +983,6 @@ public abstract class CameraDevice implements AutoCloseable {
		@ErrorCode int error); // Must implement
		}

		/**
		* Temporary for migrating to Callback naming
		* @hide
		*/
		public static abstract class StateListener extends StateCallback {
		}

		/**
		* To be inherited by android.hardware.camera2.* code only.
		* @hide