diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-06-10 00:18:39 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-06-10 00:18:39 -0700 |
| commit | 084af5e1977e2278e68a69615f55d5fe3bb6c1a4 (patch) | |
| tree | 0d0b2bbf5d5de6ffe8785a2048d1e4c8668bc19e | |
| parent | 0e1ca5749a96778869ef62f939542a61c034209b (diff) | |
| parent | c8b24085f5cac97aafe81c32d9817e52eda6b35c (diff) | |
| download | frameworks_base-084af5e1977e2278e68a69615f55d5fe3bb6c1a4.zip frameworks_base-084af5e1977e2278e68a69615f55d5fe3bb6c1a4.tar.gz frameworks_base-084af5e1977e2278e68a69615f55d5fe3bb6c1a4.tar.bz2 | |
Merge change 3551 into donut
* changes:
Allow the owner to reconnect 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 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; } |