diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-06-10 00:20:15 -0700 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2009-06-10 00:20:15 -0700 |
| commit | 1ea7ac24e73fa438862632be54724099c0295ebb (patch) | |
| tree | 74202285447556fcf2eab49e6fbad8ef1f1d6c60 /camera | |
| parent | 0f61f7fa94fe94f2eb8e0d4702b891e29db86dea (diff) | |
| parent | 2b1f164a23c1d633f9eb29dbc0be9e073dc0667d (diff) | |
| download | frameworks_native-1ea7ac24e73fa438862632be54724099c0295ebb.zip frameworks_native-1ea7ac24e73fa438862632be54724099c0295ebb.tar.gz frameworks_native-1ea7ac24e73fa438862632be54724099c0295ebb.tar.bz2 | |
am 084af5e1: Merge change 3551 into donut
Merge commit '084af5e1977e2278e68a69615f55d5fe3bb6c1a4'
* commit '084af5e1977e2278e68a69615f55d5fe3bb6c1a4':
Allow the owner to reconnect to Camera.
Diffstat (limited to 'camera')
| -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 453dc29..df15e3b 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; } |