commit cb7e490c996a9d018a4ead4b87e7339b1af47855
author Alex Ray <aray@google.com> Mon Mar 18 19:55:28 2013 +0000
committer Android Git Automerger <android-git-automerger@android.com> Mon Mar 18 19:55:28 2013 +0000
tree 1170dcf4e4038277301df1e7aabcdfdf5577b96e
parent 03b7d62170ea5ee595521f89b11a03850d31c886
parent 307c058cbded02a9c36eff40787c86473c2617ec

am 769728f1: Merge "Camera: fix waitUntilDrained log message" into jb-mr2-dev

* commit '769728f1ccfb328747c02a534c3a950eb7b026cb':
  Camera: fix waitUntilDrained log message

services/camera/libcameraservice/Camera2Device.cpp

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 @@
         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;
         }
     }