| commit | 54aff2d536344dd7f912c51c79bcf5fc4a342242 | [log] [tgz] |
|---|---|---|
| author | Shuzhen Wang <shuzhenwang@google.com> | Sat Dec 09 03:32:57 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Dec 09 03:32:57 2023 +0000 |
| tree | f231d1078226bc7b18bac6ea8799e52ec3bdc90c | |
| parent | 1115c864d6071b40923790a5d31ee4860601baf1 [diff] | |
| parent | 8afead698e0dcc11029ca950a824de39ec971959 [diff] |
Merge "Camera: Fix mandatory stream combination links" into udc-dev am: 8afead698e Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/25548794 Change-Id: I88bc84aa7f8643b217779c15d5166a820cffa9a7 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,