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 | 34e5a156b87d6dd0c65c9a9341c93dd3e71087b9 (patch) | |
| tree | b74d7b5c26f4bcb17ab800f980ddb0d6afe9f91a /camera/libcameraservice | |
| parent | bf07da97a4a58d5d4a16e60e3f9b5478a9157ad9 (diff) | |
| download | frameworks_native-34e5a156b87d6dd0c65c9a9341c93dd3e71087b9.zip frameworks_native-34e5a156b87d6dd0c65c9a9341c93dd3e71087b9.tar.gz frameworks_native-34e5a156b87d6dd0c65c9a9341c93dd3e71087b9.tar.bz2 | |
Allow the owner to reconnect to Camera.
Diffstat (limited to 'camera/libcameraservice')
| -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; } |