Merge "remove flag camera_device_setup" into main (a2e00828) · Commits · e / os / android_frameworks_base

core/api/current.txt

+16 −16

Original line number	Diff line number	Diff line
		@@ -19779,12 +19779,12 @@ package android.hardware.camera2 {
		field public static final int TEMPLATE_ZERO_SHUTTER_LAG = 5; // 0x5
		}

		@FlaggedApi("com.android.internal.camera.flags.camera_device_setup") public abstract static class CameraDevice.CameraDeviceSetup {
		method @FlaggedApi("com.android.internal.camera.flags.camera_device_setup") @NonNull public abstract android.hardware.camera2.CaptureRequest.Builder createCaptureRequest(int) throws android.hardware.camera2.CameraAccessException;
		method @FlaggedApi("com.android.internal.camera.flags.camera_device_setup") @NonNull public abstract String getId();
		method @FlaggedApi("com.android.internal.camera.flags.camera_device_setup") @NonNull public abstract android.hardware.camera2.CameraCharacteristics getSessionCharacteristics(@NonNull android.hardware.camera2.params.SessionConfiguration) throws android.hardware.camera2.CameraAccessException;
		method @FlaggedApi("com.android.internal.camera.flags.camera_device_setup") public abstract boolean isSessionConfigurationSupported(@NonNull android.hardware.camera2.params.SessionConfiguration) throws android.hardware.camera2.CameraAccessException;
		method @FlaggedApi("com.android.internal.camera.flags.camera_device_setup") @RequiresPermission(android.Manifest.permission.CAMERA) public abstract void openCamera(@NonNull java.util.concurrent.Executor, @NonNull android.hardware.camera2.CameraDevice.StateCallback) throws android.hardware.camera2.CameraAccessException;
		public abstract static class CameraDevice.CameraDeviceSetup {
		method @NonNull public abstract android.hardware.camera2.CaptureRequest.Builder createCaptureRequest(int) throws android.hardware.camera2.CameraAccessException;
		method @NonNull public abstract String getId();
		method @NonNull public abstract android.hardware.camera2.CameraCharacteristics getSessionCharacteristics(@NonNull android.hardware.camera2.params.SessionConfiguration) throws android.hardware.camera2.CameraAccessException;
		method public abstract boolean isSessionConfigurationSupported(@NonNull android.hardware.camera2.params.SessionConfiguration) throws android.hardware.camera2.CameraAccessException;
		method @RequiresPermission(android.Manifest.permission.CAMERA) public abstract void openCamera(@NonNull java.util.concurrent.Executor, @NonNull android.hardware.camera2.CameraDevice.StateCallback) throws android.hardware.camera2.CameraAccessException;
		}

		public abstract static class CameraDevice.StateCallback {
		@@ -19856,12 +19856,12 @@ package android.hardware.camera2 {

		public final class CameraManager {
		method @NonNull public android.hardware.camera2.CameraCharacteristics getCameraCharacteristics(@NonNull String) throws android.hardware.camera2.CameraAccessException;
		method @FlaggedApi("com.android.internal.camera.flags.camera_device_setup") @NonNull public android.hardware.camera2.CameraDevice.CameraDeviceSetup getCameraDeviceSetup(@NonNull String) throws android.hardware.camera2.CameraAccessException;
		method @NonNull public android.hardware.camera2.CameraDevice.CameraDeviceSetup getCameraDeviceSetup(@NonNull String) throws android.hardware.camera2.CameraAccessException;
		method @NonNull public android.hardware.camera2.CameraExtensionCharacteristics getCameraExtensionCharacteristics(@NonNull String) throws android.hardware.camera2.CameraAccessException;
		method @NonNull public String[] getCameraIdList() throws android.hardware.camera2.CameraAccessException;
		method @NonNull public java.util.Set<java.util.Set<java.lang.String>> getConcurrentCameraIds() throws android.hardware.camera2.CameraAccessException;
		method public int getTorchStrengthLevel(@NonNull String) throws android.hardware.camera2.CameraAccessException;
		method @FlaggedApi("com.android.internal.camera.flags.camera_device_setup") public boolean isCameraDeviceSetupSupported(@NonNull String) throws android.hardware.camera2.CameraAccessException;
		method public boolean isCameraDeviceSetupSupported(@NonNull String) throws android.hardware.camera2.CameraAccessException;
		method @RequiresPermission(android.Manifest.permission.CAMERA) public boolean isConcurrentSessionConfigurationSupported(@NonNull java.util.Map<java.lang.String,android.hardware.camera2.params.SessionConfiguration>) throws android.hardware.camera2.CameraAccessException;
		method @RequiresPermission(android.Manifest.permission.CAMERA) public void openCamera(@NonNull String, @NonNull android.hardware.camera2.CameraDevice.StateCallback, @Nullable android.os.Handler) throws android.hardware.camera2.CameraAccessException;
		method @RequiresPermission(android.Manifest.permission.CAMERA) public void openCamera(@NonNull String, @NonNull java.util.concurrent.Executor, @NonNull android.hardware.camera2.CameraDevice.StateCallback) throws android.hardware.camera2.CameraAccessException;
		@@ -20638,14 +20638,14 @@ package android.hardware.camera2.params {
		ctor public OutputConfiguration(@NonNull android.view.Surface);
		ctor public OutputConfiguration(int, @NonNull android.view.Surface);
		ctor public <T> OutputConfiguration(@NonNull android.util.Size, @NonNull Class<T>);
		ctor @FlaggedApi("com.android.internal.camera.flags.camera_device_setup") public OutputConfiguration(int, @NonNull android.util.Size);
		ctor @FlaggedApi("com.android.internal.camera.flags.camera_device_setup") public OutputConfiguration(int, int, @NonNull android.util.Size);
		ctor @FlaggedApi("com.android.internal.camera.flags.camera_device_setup") public OutputConfiguration(int, @NonNull android.util.Size, long);
		ctor @FlaggedApi("com.android.internal.camera.flags.camera_device_setup") public OutputConfiguration(int, int, @NonNull android.util.Size, long);
		ctor public OutputConfiguration(int, @NonNull android.util.Size);
		ctor public OutputConfiguration(int, int, @NonNull android.util.Size);
		ctor public OutputConfiguration(int, @NonNull android.util.Size, long);
		ctor public OutputConfiguration(int, int, @NonNull android.util.Size, long);
		method public void addSensorPixelModeUsed(int);
		method public void addSurface(@NonNull android.view.Surface);
		method @NonNull public static java.util.Collection<android.hardware.camera2.params.OutputConfiguration> createInstancesForMultiResolutionOutput(@NonNull android.hardware.camera2.MultiResolutionImageReader);
		method @FlaggedApi("com.android.internal.camera.flags.camera_device_setup") @NonNull public static java.util.List<android.hardware.camera2.params.OutputConfiguration> createInstancesForMultiResolutionOutput(@NonNull java.util.Collection<android.hardware.camera2.params.MultiResolutionStreamInfo>, int);
		method @NonNull public static java.util.List<android.hardware.camera2.params.OutputConfiguration> createInstancesForMultiResolutionOutput(@NonNull java.util.Collection<android.hardware.camera2.params.MultiResolutionStreamInfo>, int);
		method public int describeContents();
		method public void enableSurfaceSharing();
		method public long getDynamicRangeProfile();
		@@ -20666,7 +20666,7 @@ package android.hardware.camera2.params {
		method public void setPhysicalCameraId(@Nullable String);
		method public void setReadoutTimestampEnabled(boolean);
		method public void setStreamUseCase(long);
		method @FlaggedApi("com.android.internal.camera.flags.camera_device_setup") public static void setSurfacesForMultiResolutionOutput(@NonNull java.util.Collection<android.hardware.camera2.params.OutputConfiguration>, @NonNull android.hardware.camera2.MultiResolutionImageReader);
		method public static void setSurfacesForMultiResolutionOutput(@NonNull java.util.Collection<android.hardware.camera2.params.OutputConfiguration>, @NonNull android.hardware.camera2.MultiResolutionImageReader);
		method public void setTimestampBase(int);
		method public void writeToParcel(android.os.Parcel, int);
		field @NonNull public static final android.os.Parcelable.Creator<android.hardware.camera2.params.OutputConfiguration> CREATOR;
		@@ -20728,7 +20728,7 @@ package android.hardware.camera2.params {

		public final class SessionConfiguration implements android.os.Parcelable {
		ctor public SessionConfiguration(int, @NonNull java.util.List<android.hardware.camera2.params.OutputConfiguration>, @NonNull java.util.concurrent.Executor, @NonNull android.hardware.camera2.CameraCaptureSession.StateCallback);
		ctor @FlaggedApi("com.android.internal.camera.flags.camera_device_setup") public SessionConfiguration(int, @NonNull java.util.List<android.hardware.camera2.params.OutputConfiguration>);
		ctor public SessionConfiguration(int, @NonNull java.util.List<android.hardware.camera2.params.OutputConfiguration>);
		method public void clearColorSpace();
		method public int describeContents();
		method @Nullable public android.graphics.ColorSpace getColorSpace();
		@@ -20741,7 +20741,7 @@ package android.hardware.camera2.params {
		method public void setColorSpace(@NonNull android.graphics.ColorSpace.Named);
		method public void setInputConfiguration(@NonNull android.hardware.camera2.params.InputConfiguration);
		method public void setSessionParameters(android.hardware.camera2.CaptureRequest);
		method @FlaggedApi("com.android.internal.camera.flags.camera_device_setup") public void setStateCallback(@NonNull java.util.concurrent.Executor, @NonNull android.hardware.camera2.CameraCaptureSession.StateCallback);
		method public void setStateCallback(@NonNull java.util.concurrent.Executor, @NonNull android.hardware.camera2.CameraCaptureSession.StateCallback);
		method public void writeToParcel(android.os.Parcel, int);
		field @NonNull public static final android.os.Parcelable.Creator<android.hardware.camera2.params.SessionConfiguration> CREATOR;
		field public static final int SESSION_HIGH_SPEED = 1; // 0x1

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

+0 −6

Original line number	Diff line number	Diff line
		@@ -1707,7 +1707,6 @@ public abstract class CameraDevice implements AutoCloseable {
		* @see CameraManager#isCameraDeviceSetupSupported(String)
		* @see CameraManager#getCameraDeviceSetup(String)
		*/
		@FlaggedApi(Flags.FLAG_CAMERA_DEVICE_SETUP)
		public abstract static class CameraDeviceSetup {
		/**
		* Create a {@link CaptureRequest.Builder} for new capture requests,
		@@ -1735,7 +1734,6 @@ public abstract class CameraDevice implements AutoCloseable {
		* @throws IllegalArgumentException if the templateType is not supported by this device
		*/
		@NonNull
		@FlaggedApi(Flags.FLAG_CAMERA_DEVICE_SETUP)
		public abstract CaptureRequest.Builder createCaptureRequest(
		@RequestTemplate int templateType) throws CameraAccessException;

		@@ -1817,7 +1815,6 @@ public abstract class CameraDevice implements AutoCloseable {
		* @see SessionConfiguration
		* @see android.media.ImageReader
		*/
		@FlaggedApi(Flags.FLAG_CAMERA_DEVICE_SETUP)
		public abstract boolean isSessionConfigurationSupported(
		@NonNull SessionConfiguration config) throws CameraAccessException;

		@@ -1865,7 +1862,6 @@ public abstract class CameraDevice implements AutoCloseable {
		* @see CameraCharacteristics#getAvailableSessionCharacteristicsKeys
		*/
		@NonNull
		@FlaggedApi(Flags.FLAG_CAMERA_DEVICE_SETUP)
		public abstract CameraCharacteristics getSessionCharacteristics(
		@NonNull SessionConfiguration sessionConfig) throws CameraAccessException;

		@@ -1890,7 +1886,6 @@ public abstract class CameraDevice implements AutoCloseable {
		*
		* @see CameraManager#openCamera(String, Executor, StateCallback)
		*/
		@FlaggedApi(Flags.FLAG_CAMERA_DEVICE_SETUP)
		@RequiresPermission(android.Manifest.permission.CAMERA)
		public abstract void openCamera(@NonNull @CallbackExecutor Executor executor,
		@NonNull StateCallback callback) throws CameraAccessException;
		@@ -1906,7 +1901,6 @@ public abstract class CameraDevice implements AutoCloseable {
		* @see CameraManager#getCameraIdList
		*/
		@NonNull
		@FlaggedApi(Flags.FLAG_CAMERA_DEVICE_SETUP)
		public abstract String getId();

		/**

core/java/android/hardware/camera2/CameraManager.java

+1 −4

Original line number	Diff line number	Diff line
		@@ -910,7 +910,6 @@ public final class CameraManager {
		* @see #openCamera
		*/
		@NonNull
		@FlaggedApi(Flags.FLAG_CAMERA_DEVICE_SETUP)
		public CameraDevice.CameraDeviceSetup getCameraDeviceSetup(@NonNull String cameraId)
		throws CameraAccessException {
		// isCameraDeviceSetup does all the error checking we need.
		@@ -958,7 +957,6 @@ public final class CameraManager {
		* @see #getCameraDeviceSetup(String)
		* @see #getCameraIdList()
		*/
		@FlaggedApi(Flags.FLAG_CAMERA_DEVICE_SETUP)
		public boolean isCameraDeviceSetupSupported(@NonNull String cameraId)
		throws CameraAccessException {
		if (cameraId == null) {
		@@ -1102,8 +1100,7 @@ public final class CameraManager {
		synchronized (mLock) {
		ICameraDeviceUser cameraUser = null;
		CameraDevice.CameraDeviceSetup cameraDeviceSetup = null;
		if (Flags.cameraDeviceSetup()
		&& CameraDeviceSetupImpl.isCameraDeviceSetupSupported(characteristics)) {
		if (CameraDeviceSetupImpl.isCameraDeviceSetupSupported(characteristics)) {
		cameraDeviceSetup = getCameraDeviceSetupUnsafe(cameraId);
		}

core/java/android/hardware/camera2/MultiResolutionImageReader.java

+0 −1

Original line number	Diff line number	Diff line
		@@ -375,7 +375,6 @@ public class MultiResolutionImageReader implements AutoCloseable {
		* part of this {@code MultiResolutionImageReader}.
		* @hide
		*/
		@FlaggedApi(Flags.FLAG_CAMERA_DEVICE_SETUP)
		public @NonNull Surface getSurface(@NonNull Size configuredSize,
		@NonNull String physicalCameraId) {
		checkNotNull(configuredSize, "configuredSize must not be null");

core/java/android/hardware/camera2/impl/CameraDeviceImpl.java

+0 −1

Original line number	Diff line number	Diff line
		@@ -1030,7 +1030,6 @@ public class CameraDeviceImpl extends CameraDevice
		synchronized (mInterfaceLock) {
		checkIfCameraClosedOrInError();
		if (CompatChanges.isChangeEnabled(CHECK_PARAMS_IN_IS_SESSION_CONFIGURATION_SUPPORTED)
		&& Flags.cameraDeviceSetup()
		&& mCameraDeviceSetup != null) {
		return mCameraDeviceSetup.isSessionConfigurationSupported(sessionConfig);
		}