diff options
| author | Alex Ray <aray@google.com> | 2013-03-18 19:52:43 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-03-18 19:52:43 +0000 |
| commit | 769728f1ccfb328747c02a534c3a950eb7b026cb (patch) | |
| tree | 8d5c2c1380d7e4bc1912e1574088b9dbf19807ea | |
| parent | edb86fe540cf45668909daa5b529f63804562105 (diff) | |
| parent | c13c8bc609be74c89a23a4e3b396b807e59047f1 (diff) | |
| download | frameworks_av-769728f1ccfb328747c02a534c3a950eb7b026cb.zip frameworks_av-769728f1ccfb328747c02a534c3a950eb7b026cb.tar.gz frameworks_av-769728f1ccfb328747c02a534c3a950eb7b026cb.tar.bz2 | |
Merge "Camera: fix waitUntilDrained log message" into jb-mr2-dev
| -rw-r--r-- | services/camera/libcameraservice/Camera2Device.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/camera/libcameraservice/Camera2Device.cpp b/services/camera/libcameraservice/Camera2Device.cpp index 37ba5ae..946cdba 100644 --- a/services/camera/libcameraservice/Camera2Device.cpp +++ b/services/camera/libcameraservice/Camera2Device.cpp @@ -426,7 +426,7 @@ status_t Camera2Device::waitUntilDrained() { totalTime += kSleepTime; if (totalTime > kMaxSleepTime) { ALOGE("%s: Waited %d us, %d requests still in flight", __FUNCTION__, - mHal2Device->ops->get_in_progress_count(mHal2Device), totalTime); + totalTime, mHal2Device->ops->get_in_progress_count(mHal2Device)); return TIMED_OUT; } } |