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

Commit 2b1f164a authored by Android (Google) Code Review's avatar Android (Google) Code Review
Browse files

Merge change 3551 into donut 

* changes:
  Allow the owner to reconnect to Camera.
parents 8628588c 34e5a156

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;

            }