| commit | 7cd75711475337ae17dbf4fb935e040b9f795051 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Mon Dec 11 22:02:54 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Dec 11 22:02:54 2023 +0000 |
| tree | fbe5ca3efcf3a1c400c9f6b4ebd6c1441b9b9a22 | |
| parent | c441fd509de746cb849663f983fdb848f39115e9 [diff] | |
| parent | 7fd104c176c50d8cd65ca8e25abad0c2102af95a [diff] |
[automerger skipped] Merge Android 14 QPR1 am: 3a00bdb92e -s ours am: 7fd104c176 -s ours am skip reason: Merged-In Id9f746bc66671d274afaedb10854d88123a04af0 with SHA-1 b1e0c41c06 is already in history Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2865975 Change-Id: I966fef123ba18ef872f8ecf22d428554c63061a7 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,