Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 87839ae3 authored by Emilian Peev's avatar Emilian Peev Committed by Automerger Merge Worker
Browse files

Merge "Camera: Allow synthetic extension metadata" into tm-dev am: eb177cd5... 

Merge "Camera: Allow synthetic extension metadata" into tm-dev am: eb177cd5 am: 5ea3dfe7 am: da8ee7b5

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18801658



Change-Id: I44d613aa1c20d4cc34f7dafe4475a1269de4a680
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c0db64b7 da8ee7b5

core/java/android/hardware/camera2/CameraExtensionCharacteristics.java

+2 −2
Original line number Original line Diff line number Diff line
@@ -854,7 +854,7 @@ public final class CameraExtensionCharacteristics { 
                Class<CaptureRequest.Key<?>> crKeyTyped = (Class<CaptureRequest.Key<?>>) crKey;

                Class<CaptureRequest.Key<?>> crKeyTyped = (Class<CaptureRequest.Key<?>>) crKey;





                ret.addAll(requestChars.getAvailableKeyList(CaptureRequest.class, crKeyTyped,

                ret.addAll(requestChars.getAvailableKeyList(CaptureRequest.class, crKeyTyped,

                        requestKeys, /*includeSynthetic*/ false));

                        requestKeys, /*includeSynthetic*/ true));

            }

            }





            // Jpeg quality and orientation must always be supported

            // Jpeg quality and orientation must always be supported
@@ -929,7 +929,7 @@ public final class CameraExtensionCharacteristics { 
                Class<CaptureResult.Key<?>> crKeyTyped = (Class<CaptureResult.Key<?>>)crKey;

                Class<CaptureResult.Key<?>> crKeyTyped = (Class<CaptureResult.Key<?>>)crKey;





                ret.addAll(resultChars.getAvailableKeyList(CaptureResult.class, crKeyTyped,

                ret.addAll(resultChars.getAvailableKeyList(CaptureResult.class, crKeyTyped,

                        resultKeys, /*includeSynthetic*/ false));

                        resultKeys, /*includeSynthetic*/ true));





                // Jpeg quality, orientation and sensor timestamp must always be supported

                // Jpeg quality, orientation and sensor timestamp must always be supported

                if (!ret.contains(CaptureResult.JPEG_QUALITY)) {

                if (!ret.contains(CaptureResult.JPEG_QUALITY)) {