commit | ced88ce66a30200e7107ca26a1f7c2a178049de1 | [log] [tgz] |
---|---|---|
author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Wed Jan 10 22:59:51 2024 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Jan 10 22:59:51 2024 +0000 |
tree | 838c98d4331693f08b1952cef0ef04a884c2b013 | |
parent | b3d65cec6c02bd330715b3e664453365f22aa1d4 [diff] | |
parent | bf0c331d5969697af126edf8498aaf48d50b567e [diff] |
Merge changes Iab6235b5,I19b7d1af,I1806d8a2,I8589ef14 into main am: 61ef14ec09 am: bf0c331d59 Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2901010 Change-Id: I619e123f5721004b342ca27937eef5d5642c1913 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/camera/metadata/aidl/android/hardware/camera/metadata/CameraMetadataTag.aidl b/camera/metadata/aidl/android/hardware/camera/metadata/CameraMetadataTag.aidl index 56aa690..3303ff9 100644 --- a/camera/metadata/aidl/android/hardware/camera/metadata/CameraMetadataTag.aidl +++ b/camera/metadata/aidl/android/hardware/camera/metadata/CameraMetadataTag.aidl
@@ -2282,7 +2282,8 @@ * * <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,