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 | 259f55a51310156d8d7362ff1932407c9087597d (patch) | |
| tree | 1c4ee36b6de56ce174a26172ff3ce432b34c2d7c /camera/libcameraservice | |
| parent | d46134946dd6c227d60cc27915b6fd477e36a598 (diff) | |
| parent | 084af5e1977e2278e68a69615f55d5fe3bb6c1a4 (diff) | |
| download | frameworks_base-259f55a51310156d8d7362ff1932407c9087597d.zip frameworks_base-259f55a51310156d8d7362ff1932407c9087597d.tar.gz frameworks_base-259f55a51310156d8d7362ff1932407c9087597d.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/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 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; } |