diff options
| author | Chih-Chung Chang <chihchung@google.com> | 2009-06-09 13:56:44 +0800 |
|---|---|---|
| committer | Chih-Chung Chang <chihchung@google.com> | 2009-06-09 13:58:51 +0800 |
| commit | c8b24085f5cac97aafe81c32d9817e52eda6b35c (patch) | |
| tree | 352549dcd8713ba1529c2fa9d645b5ee8fdda6b5 /camera/libcameraservice/CameraService.cpp | |
| parent | bac43254b219c827f3d1fd286f4a7f19e9ee2f05 (diff) | |
| download | frameworks_base-c8b24085f5cac97aafe81c32d9817e52eda6b35c.zip frameworks_base-c8b24085f5cac97aafe81c32d9817e52eda6b35c.tar.gz frameworks_base-c8b24085f5cac97aafe81c32d9817e52eda6b35c.tar.bz2 | |
Allow the owner to reconnect to Camera.
Diffstat (limited to 'camera/libcameraservice/CameraService.cpp')
| -rw-r--r-- | camera/libcameraservice/CameraService.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/camera/libcameraservice/CameraService.cpp b/camera/libcameraservice/CameraService.cpp index 4e6859c..a3ab641 100644 --- a/camera/libcameraservice/CameraService.cpp +++ b/camera/libcameraservice/CameraService.cpp @@ -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; } |