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

Merge change 3551 into donut

Browse Source 
* changes:
  Allow the owner to reconnect to Camera.
This commit is contained in:
Android (Google) Code Review
2009-06-10 00:18:39 -07:00
parent 0e1ca5749a c8b24085f5
commit 084af5e197
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; sp<ICameraClient> oldClient;
{ {
Mutex::Autolock _l(mLock); Mutex::Autolock _l(mLock);
if (mClientPid != 0) { if (mClientPid != 0 && checkPid() != NO_ERROR) {
LOGW("Tried to connect to locked camera"); LOGW("Tried to connect to locked camera");
return -EBUSY; return -EBUSY;
} }