diff options
| author | Chih-Chung Chang <chihchung@google.com> | 2009-06-24 19:59:31 +0800 |
|---|---|---|
| committer | Chih-Chung Chang <chihchung@google.com> | 2009-06-25 11:03:55 +0800 |
| commit | d5d1ebd7682aaf09cd54243910437da43f12295e (patch) | |
| tree | a248cb7747c1dcec40b1bf00b7350e732b7c091c /camera/libcameraservice/CameraService.h | |
| parent | 82a32714f07d25259b91163d383ccdb74a166d2d (diff) | |
| download | frameworks_base-d5d1ebd7682aaf09cd54243910437da43f12295e.zip frameworks_base-d5d1ebd7682aaf09cd54243910437da43f12295e.tar.gz frameworks_base-d5d1ebd7682aaf09cd54243910437da43f12295e.tar.bz2 | |
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.
Diffstat (limited to 'camera/libcameraservice/CameraService.h')
| -rw-r--r-- | camera/libcameraservice/CameraService.h | 2 |
1 files changed, 1 insertions, 1 deletions
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 @@ private: virtual void incUsers(); virtual void decUsers(); - mutable Mutex mLock; + mutable Mutex mServiceLock; wp<Client> mClient; #if DEBUG_HEAP_LEAKS |