commit e98ba492c1e796030fa8718fe25e16754621dab3
author Android (Google) Code Review <android-gerrit@google.com> Wed Jun 10 02:43:11 2009 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jun 10 02:43:11 2009 -0700
tree fa3b412b8c5f58fc596e1abf3b1041b5713a526a
parent 88822414da3d58ab0ececcdb7a0a6434e72f18a2
parent 8628588c511d852d1a675b39a62750ea17e784a0

Merge change 3702 into donut

* changes:
  Change exceptions to RuntimeException.

camera/libcameraservice/CameraService.cpp

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 @@
         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;
             }