commit | 6e2dd5139fb3cae3a62ff52e397b72080658f36b | [log] [tgz] |
---|---|---|
author | Andres Schafhauser <aschafhauser@google.com> | Fri Jan 12 21:57:29 2024 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Jan 12 21:57:29 2024 +0000 |
tree | 18ab6bd7482f494306997e95dbe2271dc0a09fd4 | |
parent | 6be17c5eb2fc2303ad8f2004a836c3bf65b7473e [diff] | |
parent | 19a97324ff6ee165b77bf4cc31ea7980048fdb1b [diff] |
[automerger skipped] APF exempt list for TVs to use hardware feature am: 393ca9ffc2 -s ours am: f005be18db -s ours am: 19a97324ff -s ours am skip reason: Merged-In I47453e7ad009b08aadf7c09fc144d2166ef9991b with SHA-1 f91d7adfc4 is already in history Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2904690 Change-Id: I70d67311a7ca571ea8d3a2e2475b978c0a8f6155 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,