commit | 72421521fd06787a407d06966e11f17b86900d2a | [log] [tgz] |
---|---|---|
author | Ben Murdoch <benm@google.com> | Wed Nov 28 13:58:29 2012 +0000 |
committer | Ben Murdoch <benm@google.com> | Wed Nov 28 13:58:29 2012 +0000 |
tree | ad2b2f65cb04b425314c988bf353b5de27728158 | |
parent | 8020c49368c2a9950e9f66092c6b07e46c5dac11 [diff] [blame] |
Fix master build. Change-Id: Ia362f74d8cd7df76292473c26c112dffe190c599
diff --git a/services/camera/libcameraservice/Camera2Client.cpp b/services/camera/libcameraservice/Camera2Client.cpp index d468aa6..5a7bb48 100644 --- a/services/camera/libcameraservice/Camera2Client.cpp +++ b/services/camera/libcameraservice/Camera2Client.cpp
@@ -1057,7 +1057,7 @@ return OK; } -status_t Camera2Client::takePicture(int /*msgType*/) { +status_t Camera2Client::takePicture(int msgType) { ATRACE_CALL(); Mutex::Autolock icl(mICameraLock); status_t res;