| commit | 8dbed42cc2303e9e3a7d7c1e663ffe7a513f1d8f | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Tue Jan 09 23:35:31 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Jan 09 23:35:31 2024 +0000 |
| tree | b9bcede70290979df2ce98945eb84b2b3fdced5c | |
| parent | b0ca0e427d6c92531bed64822d29f92ecad0420a [diff] | |
| parent | 02e41b2f79d759708d39b4c81bf8e23a43033d2c [diff] |
Merge changes Icfaa316b,Ic26706d7 into main am: 671b88bf73 am: 02e41b2f79 Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2902174 Change-Id: I8d274fbbd050f726f77fe12013285dd63710f181 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,