commit caab7b1686b754427243d18dfeac119658e83744
author Eino-Ville Talvala <etalvala@google.com> Fri Aug 10 10:12:25 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Fri Aug 10 10:12:25 2012 -0700
tree a0f6e14ddd52e191095b513da9c8b29e4275b16a
parent a253877eb94ea4551b54bd91a1fbaed09dc0cb02
parent c0810621b8db2b5ca3012e7ad87e4ccb074100d2

am c0810621: am 603b12ef: Camera2: Swap AF notification order, minor bug fix.

* commit 'c0810621b8db2b5ca3012e7ad87e4ccb074100d2':
  Camera2: Swap AF notification order, minor bug fix.

services/camera/libcameraservice/Camera2Client.cpp

diff --git a/services/camera/libcameraservice/Camera2Client.cpp b/services/camera/libcameraservice/Camera2Client.cpp
index 4566c75..9c2fbcb 100644
--- a/services/camera/libcameraservice/Camera2Client.cpp
+++ b/services/camera/libcameraservice/Camera2Client.cpp
@@ -1790,14 +1790,13 @@
                 }
         }
     }
-    if (sendCompletedMessage) {
-        mCameraClient->notifyCallback(CAMERA_MSG_FOCUS, success ? 1 : 0, 0);
-    }
     if (sendMovingMessage) {
         mCameraClient->notifyCallback(CAMERA_MSG_FOCUS_MOVE,
                 afInMotion ? 1 : 0, 0);
     }
-
+    if (sendCompletedMessage) {
+        mCameraClient->notifyCallback(CAMERA_MSG_FOCUS, success ? 1 : 0, 0);
+    }
 }
 
 void Camera2Client::notifyAutoExposure(uint8_t newState, int triggerId) {

services/camera/libcameraservice/Camera2Device.cpp

diff --git a/services/camera/libcameraservice/Camera2Device.cpp b/services/camera/libcameraservice/Camera2Device.cpp
index a009636..7c97e1e 100644
--- a/services/camera/libcameraservice/Camera2Device.cpp
+++ b/services/camera/libcameraservice/Camera2Device.cpp
@@ -127,7 +127,8 @@
         }
     }
 
-    result.appendFormat("  Camera2Device[%d] dump (detail level %d):\n", mId);
+    result.appendFormat("  Camera2Device[%d] dump (detail level %d):\n",
+            mId, detailLevel);
 
     if (detailLevel > 0) {
         result = "    Request queue contents:\n";