Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 084af5e1: Merge change 3551 into donut

Browse Source 
Merge commit '084af5e1977e2278e68a69615f55d5fe3bb6c1a4'

* commit '084af5e1977e2278e68a69615f55d5fe3bb6c1a4':
  Allow the owner to reconnect to Camera.
This commit is contained in:
Android (Google) Code Review
2009-06-10 00:20:15 -07:00
committed by The Android Open Source Project
parent d46134946d 084af5e197
commit 259f55a513
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
camera/libcameraservice/CameraService.cpp
View File

@@ -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;
}