| commit | 2f9fdfedc31c862d59dd05917dc76a028aaa34c2 | [log] [tgz] |
|---|---|---|
| author | Yu Shan <shanyu@google.com> | Tue Jan 30 18:50:39 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Jan 30 18:50:39 2024 +0000 |
| tree | d8fa7efac7dbd2a654474a73235b132f8584609c | |
| parent | 786b7371638ee9e033f01fdff9eda4dd8cb945c2 [diff] | |
| parent | 8cda776ffe4a7392b27c6962b6f4dfcf218cc7e7 [diff] |
[automerger skipped] Fix HIDL VHAL descriptor name in VTS. am: 928062ccac am: 8cda776ffe -s ours am skip reason: Merged-In I93e92d3587243c44b5651ab85d47442ebb64c51a with SHA-1 928062ccac is already in history Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2928798 Change-Id: I0cb184d16e0848df4d004e0b887aa920c0334f03 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,