| commit | 72bd049404c88ba951c2bfbd7c2608c93a46e4ab | [log] [tgz] |
|---|---|---|
| author | Yu Shan <shanyu@google.com> | Wed Jan 31 23:25:58 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Jan 31 23:25:58 2024 +0000 |
| tree | dc78796d4322fee9047c8b52296d01acc68ef8ae | |
| parent | c9dea30228ebe571f9de1fef55193b6fcf708a86 [diff] | |
| parent | 2b31910a479c4f4ac8a77d0f1fb3c93fd93c80ce [diff] |
[automerger skipped] Add retry in setProp test. am: 62fe882688 -s ours am: 2b31910a47 -s ours am skip reason: Merged-In If9349a097a92c51101c7b5f4bf807b610ab2cb0b with SHA-1 1837df06c2 is already in history Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2927410 Change-Id: I0014e91b5abeed0dcb8c5772504abf55cb1739b1 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,