commit fa89f9f89758925d7c32a03aaa44671d7a91a06c
author Chih-Chung Chang <chihchung@google.com> Wed Jun 24 13:44:37 2009 +0800
committer Chih-Chung Chang <chihchung@google.com> Wed Jun 24 15:50:57 2009 +0800
tree 2d59574b4f07c26e4c093b74642da72f41efa4b3
parent afc52f99e12f0d634b8926c787c44c6e1e5a9233

Fix 1933269: startPreview failed.

The reason we need this count is a new CameraService::connect() request may
come in while the previous Client's destructor has not been run or is still
running. If the last strong reference of the previous Client is gone but
destructor has not been run, we should not allow the new Client to be created
because we need to wait for the previous Client to tear down the hardware
first.

camera/libcameraservice/CameraService.h

diff --git a/camera/libcameraservice/CameraService.h b/camera/libcameraservice/CameraService.h
index a421fd3..729e539 100644
--- a/camera/libcameraservice/CameraService.h
+++ b/camera/libcameraservice/CameraService.h
@@ -194,6 +194,11 @@
                             CameraService();
     virtual                 ~CameraService();
 
+    // We use a count for number of clients (shoule only be 0 or 1).
+    volatile    int32_t                     mUsers;
+    virtual     void                        incUsers();
+    virtual     void                        decUsers();
+
     mutable     Mutex                       mLock;
                 wp<Client>                  mClient;