diff options
| author | 2022-06-13 22:10:07 +0000 | |
|---|---|---|
| committer | 2022-06-13 22:10:07 +0000 | |
| commit | 29a9bf7f85bd787b1f12f7395d8b9ba86caf6acc (patch) | |
| tree | 0724be58243f61ef011ec1943625b77de3a04215 | |
| parent | 2d08c910094b95b5289b6b4f0169c4d41bd47885 (diff) | |
| parent | 53b01eb30390c48b0bdfd15a01597cd2a68985b7 (diff) | |
Merge "Camera: Allow synthetic extension metadata" into tm-dev am: eb177cd5d6 am: 53b01eb303
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18801658
Change-Id: Id4bc3cea32f57dd893c27d0977771ea8b38213ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | core/java/android/hardware/camera2/CameraExtensionCharacteristics.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/hardware/camera2/CameraExtensionCharacteristics.java b/core/java/android/hardware/camera2/CameraExtensionCharacteristics.java index cf611fb3adcf..0f6010fffcb6 100644 --- a/core/java/android/hardware/camera2/CameraExtensionCharacteristics.java +++ b/core/java/android/hardware/camera2/CameraExtensionCharacteristics.java @@ -854,7 +854,7 @@ public final class CameraExtensionCharacteristics { Class<CaptureRequest.Key<?>> crKeyTyped = (Class<CaptureRequest.Key<?>>) crKey; ret.addAll(requestChars.getAvailableKeyList(CaptureRequest.class, crKeyTyped, - requestKeys, /*includeSynthetic*/ false)); + requestKeys, /*includeSynthetic*/ true)); } // Jpeg quality and orientation must always be supported @@ -929,7 +929,7 @@ public final class CameraExtensionCharacteristics { Class<CaptureResult.Key<?>> crKeyTyped = (Class<CaptureResult.Key<?>>)crKey; ret.addAll(resultChars.getAvailableKeyList(CaptureResult.class, crKeyTyped, - resultKeys, /*includeSynthetic*/ false)); + resultKeys, /*includeSynthetic*/ true)); // Jpeg quality, orientation and sensor timestamp must always be supported if (!ret.contains(CaptureResult.JPEG_QUALITY)) { |