camera: Address ANAPIC review comments and additional cleanup
Bug: 218911443
Test: build
Change-Id: Ia6d3f4d73e9ff29fa5fca2e11e0b9cb5a8d1e2ac
Signed-off-by: Jayant Chowdhary <jchowdhary@google.com>
diff --git a/camera/common/aidl/aidl_api/android.hardware.camera.common/current/android/hardware/camera/common/Status.aidl b/camera/common/aidl/aidl_api/android.hardware.camera.common/current/android/hardware/camera/common/Status.aidl
index e1ec189..8658927 100644
--- a/camera/common/aidl/aidl_api/android.hardware.camera.common/current/android/hardware/camera/common/Status.aidl
+++ b/camera/common/aidl/aidl_api/android.hardware.camera.common/current/android/hardware/camera/common/Status.aidl
@@ -38,8 +38,7 @@
ILLEGAL_ARGUMENT = 1,
CAMERA_IN_USE = 2,
MAX_CAMERAS_IN_USE = 3,
- METHOD_NOT_SUPPORTED = 4,
- OPERATION_NOT_SUPPORTED = 5,
- CAMERA_DISCONNECTED = 6,
- INTERNAL_ERROR = 7,
+ OPERATION_NOT_SUPPORTED = 4,
+ CAMERA_DISCONNECTED = 5,
+ INTERNAL_ERROR = 6,
}
diff --git a/camera/common/aidl/android/hardware/camera/common/Status.aidl b/camera/common/aidl/android/hardware/camera/common/Status.aidl
index 1ea6ee8..4341d40 100644
--- a/camera/common/aidl/android/hardware/camera/common/Status.aidl
+++ b/camera/common/aidl/android/hardware/camera/common/Status.aidl
@@ -35,30 +35,26 @@
* One of the arguments to the method call is invalid. For example,
* the camera ID is unknown.
*/
- ILLEGAL_ARGUMENT = 1,
+ ILLEGAL_ARGUMENT,
/**
* The specified camera device is already in use
*/
- CAMERA_IN_USE = 2,
+ CAMERA_IN_USE,
/**
* The HAL cannot support more simultaneous cameras in use.
*/
- MAX_CAMERAS_IN_USE = 3,
- /**
- * This HAL does not support this method.
- */
- METHOD_NOT_SUPPORTED = 4,
+ MAX_CAMERAS_IN_USE,
/**
* The specified camera device does not support this operation.
*/
- OPERATION_NOT_SUPPORTED = 5,
+ OPERATION_NOT_SUPPORTED,
/**
* This camera device is no longer connected or otherwise available for use
*/
- CAMERA_DISCONNECTED = 6,
+ CAMERA_DISCONNECTED,
/**
* The HAL has encountered an internal error and cannot complete the
* request.
*/
- INTERNAL_ERROR = 7,
+ INTERNAL_ERROR,
}
diff --git a/camera/device/aidl/aidl_api/android.hardware.camera.device/current/android/hardware/camera/device/ICameraDevice.aidl b/camera/device/aidl/aidl_api/android.hardware.camera.device/current/android/hardware/camera/device/ICameraDevice.aidl
index 80bfc3c..51c6067 100644
--- a/camera/device/aidl/aidl_api/android.hardware.camera.device/current/android/hardware/camera/device/ICameraDevice.aidl
+++ b/camera/device/aidl/aidl_api/android.hardware.camera.device/current/android/hardware/camera/device/ICameraDevice.aidl
@@ -34,7 +34,6 @@
package android.hardware.camera.device;
@VintfStability
interface ICameraDevice {
- void dumpState(in ParcelFileDescriptor fd);
android.hardware.camera.device.CameraMetadata getCameraCharacteristics();
android.hardware.camera.device.CameraMetadata getPhysicalCameraCharacteristics(in String physicalCameraId);
android.hardware.camera.common.CameraResourceCost getResourceCost();
diff --git a/camera/device/aidl/android/hardware/camera/device/ICameraDevice.aidl b/camera/device/aidl/android/hardware/camera/device/ICameraDevice.aidl
index f1f26d8..57705bc 100644
--- a/camera/device/aidl/android/hardware/camera/device/ICameraDevice.aidl
+++ b/camera/device/aidl/android/hardware/camera/device/ICameraDevice.aidl
@@ -22,7 +22,6 @@
import android.hardware.camera.device.ICameraDeviceSession;
import android.hardware.camera.device.ICameraInjectionSession;
import android.hardware.camera.device.StreamConfiguration;
-
import android.os.ParcelFileDescriptor;
/**
@@ -35,31 +34,6 @@
@VintfStability
interface ICameraDevice {
/**
- * dumpState:
- *
- * Print out debugging state for the camera device. This may be called by
- * the framework when the camera service is asked for a debug dump, which
- * happens when using the dumpsys tool, or when capturing a bugreport.
- *
- * The passed-in file descriptor can be used to write debugging text using
- * dprintf() or write().
- *
- * In case this camera device has been disconnected, the dump must not fail,
- * but may simply print out 'Device disconnected' or equivalent.
- *
- * Performance requirements:
- *
- * This must be a non-blocking call. The HAL should return from this call
- * in 1ms, must return from this call in 10ms. This call must avoid
- * deadlocks, as it may be called at any point during camera operation.
- * Any synchronization primitives used (such as mutex locks or semaphores)
- * must be acquired with a timeout.
- *
- * @param fd The file descriptor to which the camera HAL must write any dumpState information.
- */
- void dumpState(in ParcelFileDescriptor fd);
-
- /**
* getCameraCharacteristics:
*
* Return the static camera information for this camera device. This
@@ -225,6 +199,8 @@
* INTERNAL_ERROR:
* The camera device cannot be opened due to an internal
* error.
+ * OPERATION_NOT_SUPPORTED:
+ * This camera device does not support opening an injection session.
* ILLEGAL_ARGUMENT:
* The callbacks handle is invalid (for example, it is null).
* CAMERA_IN_USE:
@@ -237,8 +213,7 @@
* longer available. This interface is now stale, and a new instance
* must be acquired if the device is reconnected. All subsequent
* calls on this interface must return CAMERA_DISCONNECTED.
- * @return The interface to the newly-opened camera session,
- * or null if status is not OK.
+ * @return The interface to the newly-opened camera session, or null if status is not OK.
*/
ICameraInjectionSession openInjectionSession(in ICameraDeviceCallback callback);
diff --git a/camera/metadata/aidl/aidl_api/android.hardware.camera.metadata/current/android/hardware/camera/metadata/CameraMetadataSectionStart.aidl b/camera/metadata/aidl/aidl_api/android.hardware.camera.metadata/current/android/hardware/camera/metadata/CameraMetadataSectionStart.aidl
index 0c355c8..3a790b3 100644
--- a/camera/metadata/aidl/aidl_api/android.hardware.camera.metadata/current/android/hardware/camera/metadata/CameraMetadataSectionStart.aidl
+++ b/camera/metadata/aidl/aidl_api/android.hardware.camera.metadata/current/android/hardware/camera/metadata/CameraMetadataSectionStart.aidl
@@ -64,7 +64,6 @@
ANDROID_SYNC_START = 1507328,
ANDROID_REPROCESS_START = 1572864,
ANDROID_DEPTH_START = 1638400,
- VENDOR_SECTION_START = -2147483648,
ANDROID_LOGICAL_MULTI_CAMERA_START = 1703936,
ANDROID_DISTORTION_CORRECTION_START = 1769472,
ANDROID_HEIC_START = 1835008,
diff --git a/camera/metadata/aidl/android/hardware/camera/metadata/CameraMetadataSectionStart.aidl b/camera/metadata/aidl/android/hardware/camera/metadata/CameraMetadataSectionStart.aidl
index d5cd0b4..93d6f13 100644
--- a/camera/metadata/aidl/android/hardware/camera/metadata/CameraMetadataSectionStart.aidl
+++ b/camera/metadata/aidl/android/hardware/camera/metadata/CameraMetadataSectionStart.aidl
@@ -57,7 +57,6 @@
ANDROID_SYNC_START = CameraMetadataSection.ANDROID_SYNC << 16,
ANDROID_REPROCESS_START = CameraMetadataSection.ANDROID_REPROCESS << 16,
ANDROID_DEPTH_START = CameraMetadataSection.ANDROID_DEPTH << 16,
- VENDOR_SECTION_START = CameraMetadataSection.VENDOR_SECTION << 16,
ANDROID_LOGICAL_MULTI_CAMERA_START = CameraMetadataSection.ANDROID_LOGICAL_MULTI_CAMERA << 16,
ANDROID_DISTORTION_CORRECTION_START = CameraMetadataSection.ANDROID_DISTORTION_CORRECTION << 16,
ANDROID_HEIC_START = CameraMetadataSection.ANDROID_HEIC << 16,
diff --git a/camera/provider/aidl/android/hardware/camera/provider/ConcurrentCameraIdCombination.aidl b/camera/provider/aidl/android/hardware/camera/provider/ConcurrentCameraIdCombination.aidl
index 7d8e486..46917a1 100644
--- a/camera/provider/aidl/android/hardware/camera/provider/ConcurrentCameraIdCombination.aidl
+++ b/camera/provider/aidl/android/hardware/camera/provider/ConcurrentCameraIdCombination.aidl
@@ -18,5 +18,9 @@
@VintfStability
parcelable ConcurrentCameraIdCombination {
+ /**
+ * Combination of camera ids, that can be opened
+ * and configured with sessions on, concurrently.
+ */
List<String> combination;
}
diff --git a/camera/provider/aidl/android/hardware/camera/provider/ICameraProvider.aidl b/camera/provider/aidl/android/hardware/camera/provider/ICameraProvider.aidl
index 7a4e010..c4eba8d 100644
--- a/camera/provider/aidl/android/hardware/camera/provider/ICameraProvider.aidl
+++ b/camera/provider/aidl/android/hardware/camera/provider/ICameraProvider.aidl
@@ -56,7 +56,6 @@
@VintfStability
interface ICameraProvider {
-
/**
* Device states to be passed to notifyDeviceStateChange().
*/
@@ -295,7 +294,7 @@
* configurations that need to be queried for support.
*
* On error, the service specific error for the operation will be, one of:
- * METHOD_NOT_SUPPORTED:
+ * OPERATION_NOT_SUPPORTED:
* The camera provider does not support stream combination query.
* INTERNAL_ERROR:
* The stream combination query cannot complete due to internal