Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cb485394 authored by Jayant Chowdhary's avatar Jayant Chowdhary
Browse files

camera: Address ANAPIC review comments and additional cleanup 



Bug: 218911443

Test: build

Change-Id: Ia6d3f4d73e9ff29fa5fca2e11e0b9cb5a8d1e2ac
Signed-off-by: default avatarJayant Chowdhary <jchowdhary@google.com>
parent 7cc7dd13

camera/common/aidl/aidl_api/android.hardware.camera.common/current/android/hardware/camera/common/Status.aidl

+3 −4
Original line number Diff line number Diff line
@@ -38,8 +38,7 @@ enum Status { 
  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,

}

camera/common/aidl/android/hardware/camera/common/Status.aidl

+6 −10
Original line number Diff line number Diff line
@@ -35,30 +35,26 @@ enum Status { 
     * 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,

}

camera/device/aidl/aidl_api/android.hardware.camera.device/current/android/hardware/camera/device/ICameraDevice.aidl

+0 −1
Original line number Diff line number Diff line
@@ -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();

camera/device/aidl/android/hardware/camera/device/ICameraDevice.aidl

+3 −28
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ import android.hardware.camera.device.ICameraDeviceCallback; 
import android.hardware.camera.device.ICameraDeviceSession;

import android.hardware.camera.device.ICameraInjectionSession;

import android.hardware.camera.device.StreamConfiguration;



import android.os.ParcelFileDescriptor;



/**
@@ -34,31 +33,6 @@ import android.os.ParcelFileDescriptor; 
 */

@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:

     *
@@ -225,6 +199,8 @@ interface ICameraDevice { 
     *     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 @@ interface ICameraDevice { 
     *         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);

camera/metadata/aidl/aidl_api/android.hardware.camera.metadata/current/android/hardware/camera/metadata/CameraMetadataSectionStart.aidl

+0 −1
Original line number Diff line number Diff line
@@ -64,7 +64,6 @@ enum CameraMetadataSectionStart { 
  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,