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

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

am 907e5651: Camera2: Don\'t let unlocks happen during recording. 

* commit '907e5651':
  Camera2: Don't let unlocks happen during recording.
parents 67dcf032 cfee40e0

services/camera/libcameraservice/Camera2Client.cpp

+6 −2
Original line number Diff line number Diff line
@@ -454,9 +454,13 @@ status_t Camera2Client::unlock() { 
    ALOGV("%s: Camera %d: Unlock call from pid %d; current client pid %d",

            __FUNCTION__, mCameraId, getCallingPid(), mClientPid);



    // TODO: Check for uninterruptable conditions



    if (mClientPid == getCallingPid()) {

        SharedParameters::Lock l(mParameters);

        if (l.mParameters.state == Parameters::RECORD ||

                l.mParameters.state == Parameters::VIDEO_SNAPSHOT) {

            ALOGD("Not allowed to unlock camera during recording.");

            return INVALID_OPERATION;

        }

        mClientPid = 0;

        mCameraClient.clear();

        mSharedCameraClient.clear();