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

Commit e9e50466 authored by Jyoti Bhayana's avatar Jyoti Bhayana Committed by Android (Google) Code Review
Browse files

Merge "Add multi-client support in camera2" into main

parents dab9aa59 18c22936

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

+1 −0
Original line number Diff line number Diff line
@@ -72,5 +72,6 @@ enum CameraMetadataSection { 
  ANDROID_AUTOMOTIVE_LENS,

  ANDROID_EXTENSION,

  ANDROID_JPEGR,

  ANDROID_SHARED_SESSION,

  VENDOR_SECTION = 0x8000,

}

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

+1 −0
Original line number Diff line number Diff line
@@ -72,5 +72,6 @@ enum CameraMetadataSectionStart { 
  ANDROID_AUTOMOTIVE_LENS_START = (android.hardware.camera.metadata.CameraMetadataSection.ANDROID_AUTOMOTIVE_LENS << 16) /* 2031616 */,

  ANDROID_EXTENSION_START = (android.hardware.camera.metadata.CameraMetadataSection.ANDROID_EXTENSION << 16) /* 2097152 */,

  ANDROID_JPEGR_START = (android.hardware.camera.metadata.CameraMetadataSection.ANDROID_JPEGR << 16) /* 2162688 */,

  ANDROID_SHARED_SESSION_START = (android.hardware.camera.metadata.CameraMetadataSection.ANDROID_SHARED_SESSION << 16) /* 2228224 */,

  VENDOR_SECTION_START = (android.hardware.camera.metadata.CameraMetadataSection.VENDOR_SECTION << 16) /* -2147483648 */,

}

camera/metadata/aidl/android/hardware/camera/metadata/CameraMetadataSection.aidl

+1 −0
Original line number Diff line number Diff line
@@ -63,5 +63,6 @@ enum CameraMetadataSection { 
    ANDROID_AUTOMOTIVE_LENS,

    ANDROID_EXTENSION,

    ANDROID_JPEGR,

    ANDROID_SHARED_SESSION,

    VENDOR_SECTION = 0x8000,

}

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

+1 −0
Original line number Diff line number Diff line
@@ -65,5 +65,6 @@ enum CameraMetadataSectionStart { 
    ANDROID_AUTOMOTIVE_LENS_START = CameraMetadataSection.ANDROID_AUTOMOTIVE_LENS << 16,

    ANDROID_EXTENSION_START = CameraMetadataSection.ANDROID_EXTENSION << 16,

    ANDROID_JPEGR_START = CameraMetadataSection.ANDROID_JPEGR << 16,

    ANDROID_SHARED_SESSION_START = CameraMetadataSection.ANDROID_SHARED_SESSION << 16,

    VENDOR_SECTION_START = CameraMetadataSection.VENDOR_SECTION << 16,

}