| commit | 8da4cd7d706d9f551bf2d08cd8b61907a10cd38d | [log] [tgz] |
|---|---|---|
| author | James Dong <jdong@google.com> | Sat Aug 04 19:58:07 2012 -0700 |
| committer | James Dong <jdong@google.com> | Sat Aug 04 20:46:14 2012 -0700 |
| tree | d859052f6839fedf654ce8cea7dea2d567ad710f | |
| parent | d9f0253353db0b859c0ca2b32eddc24e3e9d4d86 [diff] [blame] |
Fix a deadlock in commandSetVideoBufferCountL() o The lock to be acquired in recordingEnabled() has aleady been acquired in sendCommand() before the call to commandSetVideoBufferCountL(). Change-Id: I664d51ef449c9eb3576d5d56f73f29c98444ff3f
diff --git a/services/camera/libcameraservice/Camera2Client.h b/services/camera/libcameraservice/Camera2Client.h index 2e6a36c..8c10d6b 100644 --- a/services/camera/libcameraservice/Camera2Client.h +++ b/services/camera/libcameraservice/Camera2Client.h
@@ -108,6 +108,8 @@ void stopPreviewL(); status_t startPreviewL(); + bool recordingEnabledL(); + // Individual commands for sendCommand() status_t commandStartSmoothZoomL(); status_t commandStopSmoothZoomL();