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

Commit c441fd50 authored by Shuzhen Wang's avatar Shuzhen Wang Committed by Automerger Merge Worker
Browse files

Merge "Camera: Fix mandatory stream combination links" into udc-dev am:... 

Merge "Camera: Fix mandatory stream combination links" into udc-dev am: 8afead69 am: 7de4f696 am: 6282a984

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/25548794



Change-Id: I0a4486fa4688b7f14163ad444f2621f997729231
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ceee7c3b 6282a984

camera/metadata/aidl/android/hardware/camera/metadata/CameraMetadataTag.aidl

+2 −1
Original line number Diff line number Diff line
@@ -2282,7 +2282,8 @@ enum CameraMetadataTag { 
     *

     * <p>Whether this camera device can support identical set of stream combinations

     * involving HEIC image format, compared to the

     * <a href="https://developer.android.com/reference/android/hardware/camera2/CameraDevice.html#legacy-level-guaranteed-configurations">table of combinations</a> involving JPEG image format required for the device's hardware

     * <a href="https://developer.android.com/reference/android/hardware/camera2/CameraDevice#legacy-level-guaranteed-configurations">table of combinations</a>

     * involving JPEG image format required for the device's hardware

     * level and capabilities.</p>

     */

    ANDROID_HEIC_INFO_SUPPORTED = CameraMetadataSectionStart.ANDROID_HEIC_INFO_START,