diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-06-24 20:34:35 -0700 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2009-06-24 20:34:35 -0700 |
| commit | c0767064c646976e036b851118b7afffed0ce5f6 (patch) | |
| tree | 9b6bc2dc9bffaeb866288530e744895783543f20 /camera/libcameraservice/CameraService.h | |
| parent | 8e5916b20fe2c084c2a1266acecf19200bb561d1 (diff) | |
| parent | c6a482e778e7b5fc5790edf22e554c93f53b1112 (diff) | |
| download | frameworks_base-c0767064c646976e036b851118b7afffed0ce5f6.zip frameworks_base-c0767064c646976e036b851118b7afffed0ce5f6.tar.gz frameworks_base-c0767064c646976e036b851118b7afffed0ce5f6.tar.bz2 | |
am c6a482e7: Merge change 5199 into donut
Merge commit 'c6a482e778e7b5fc5790edf22e554c93f53b1112'
* commit 'c6a482e778e7b5fc5790edf22e554c93f53b1112':
Only remove client after the hardware is teared down, so a new 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 |