commit d2d6bc7552ee88063c0c26cffed87624e8aac478
author Chih-Chung Chang <chihchung@google.com> Wed Jun 24 19:59:31 2009 +0800
committer Chih-Chung Chang <chihchung@google.com> Thu Jun 25 11:03:55 2009 +0800
tree 37d9656e830a9debdb26ad32a99fc1cba719bac5
parent c8be159ba67931ae38c552fc7b9da6084ca5a60a

Only remove client after the hardware is teared down, so a new client
is rejected before old client is done.

Also check mUsers in all cases to make sure there are no existing client.

camera/libcameraservice/CameraService.h

diff --git a/camera/libcameraservice/CameraService.h b/camera/libcameraservice/CameraService.h
index 729e539..8b8b54c 100644
--- a/camera/libcameraservice/CameraService.h
+++ b/camera/libcameraservice/CameraService.h
@@ -199,7 +199,7 @@
     virtual     void                        incUsers();
     virtual     void                        decUsers();
 
-    mutable     Mutex                       mLock;
+    mutable     Mutex                       mServiceLock;
                 wp<Client>                  mClient;
 
 #if DEBUG_HEAP_LEAKS