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

Commit 117a733f authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Camera: Reset metadata entry before ZSL query" into sc-dev am: 264aaa98 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1271fd125bdfa88912727f0769a468b12817111d
parents ee41dec5 264aaa98

services/camera/libcameraservice/device3/Camera3Device.cpp

+1 −0
Original line number Diff line number Diff line
@@ -4802,6 +4802,7 @@ status_t Camera3Device::RequestThread::prepareHalRequests() { 
                ATRACE_ASYNC_BEGIN("still capture", mNextRequests[i].halRequest.frame_number);

            }



            e = camera_metadata_ro_entry_t();

            find_camera_metadata_ro_entry(settings, ANDROID_CONTROL_ENABLE_ZSL, &e);

            if ((e.count > 0) && (e.data.u8[0] == ANDROID_CONTROL_ENABLE_ZSL_TRUE)) {

                isZslCapture = true;