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

Commit 20786771 authored by Shuzhen Wang's avatar Shuzhen Wang
Browse files

Camera: Silence log spam 

HAL is allowed to return captureResult from different thread contexts.
Do not do ALOGW if this is the case.

Test: Run camera and check logspam is gone
Bug: 62068207
Change-Id: I86e77fc578953cefecf10ebc4d395edf33627e8c
parent 3cc7c4e3

camera/device/3.2/default/CameraDeviceSession.cpp

+1 −2
Original line number Diff line number Diff line
@@ -588,8 +588,7 @@ void CameraDeviceSession::ResultBatcher::notify(NotifyMsg& msg) { 
void CameraDeviceSession::ResultBatcher::invokeProcessCaptureResultCallback(

        hidl_vec<CaptureResult> &results, bool tryWriteFmq) {

    if (mProcessCaptureResultLock.tryLock() != OK) {

        ALOGW("%s: previous call is not finished! waiting 1s...",

                __FUNCTION__);

        ALOGV("%s: previous call is not finished! waiting 1s...", __FUNCTION__);

        if (mProcessCaptureResultLock.timedLock(1000000000 /* 1s */) != OK) {

            ALOGE("%s: cannot acquire lock in 1s, cannot proceed",

                    __FUNCTION__);