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

Commit 1ea7ac24 authored by Android (Google) Code Review's avatar Android (Google) Code Review Committed by The Android Open Source Project
Browse files

am 084af5e1: Merge change 3551 into donut 

Merge commit '084af5e1977e2278e68a69615f55d5fe3bb6c1a4'

* commit '084af5e1977e2278e68a69615f55d5fe3bb6c1a4':
  Allow the owner to reconnect to Camera.
parents 0f61f7fa 2b1f164a

camera/libcameraservice/CameraService.cpp

+1 −1
Original line number Diff line number Diff line
@@ -245,7 +245,7 @@ status_t CameraService::Client::connect(const sp<ICameraClient>& client) 
        sp<ICameraClient> oldClient;

        {

            Mutex::Autolock _l(mLock);

            if (mClientPid != 0) {

            if (mClientPid != 0 && checkPid() != NO_ERROR) {

                LOGW("Tried to connect to locked camera");

                return -EBUSY;

            }