diff options
author | Ben Murdoch <benm@google.com> | 2012-11-28 13:58:29 +0000 |
---|---|---|
committer | Ben Murdoch <benm@google.com> | 2012-11-28 13:58:29 +0000 |
commit | ff82370c7c04340d50673d425f48acafd00f2bc9 (patch) | |
tree | df73280be8939b9a6f390047043fc5d1c0c70a3d /services | |
parent | 965537e0a4ffce356bdb74c63e0b975e648e8824 (diff) | |
download | frameworks_av-ff82370c7c04340d50673d425f48acafd00f2bc9.zip frameworks_av-ff82370c7c04340d50673d425f48acafd00f2bc9.tar.gz frameworks_av-ff82370c7c04340d50673d425f48acafd00f2bc9.tar.bz2 |
Fix master build.
Change-Id: Ia362f74d8cd7df76292473c26c112dffe190c599
Diffstat (limited to 'services')
-rw-r--r-- | services/camera/libcameraservice/Camera2Client.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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 @@ status_t Camera2Client::cancelAutoFocus() { return OK; } -status_t Camera2Client::takePicture(int /*msgType*/) { +status_t Camera2Client::takePicture(int msgType) { ATRACE_CALL(); Mutex::Autolock icl(mICameraLock); status_t res; |