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

Commit 36186390 authored by Eino-Ville Talvala's avatar Eino-Ville Talvala Committed by Android Git Automerger
Browse files

am b8d6efba: Camera2: Don\'t hold locks while waiting to sync. 

* commit 'b8d6efba':
  Camera2: Don't hold locks while waiting to sync.
parents add3dfc4 1d838ceb

services/camera/libcameraservice/Camera2Client.cpp

+35 −33
Original line number Diff line number Diff line
@@ -1068,6 +1068,7 @@ status_t Camera2Client::takePicture(int msgType) { 
    status_t res;

    if ( (res = checkPid(__FUNCTION__) ) != OK) return res;



    {

        SharedParameters::Lock l(mParameters);

        switch (l.mParameters.state) {

            case Parameters::DISCONNECTED:
@@ -1105,6 +1106,7 @@ status_t Camera2Client::takePicture(int msgType) { 
                    __FUNCTION__, mCameraId, strerror(-res), res);

            return res;

        }

    }



    // Need HAL to have correct settings before (possibly) triggering precapture

    syncWithDevice();