Camera2: Swap AF notification order, minor bug fix.

In continuous AF modes, when an AF trigger/cancel is received in the
middle of a passive AF scan, we want to send both an AF move stop
callback and an AF done callback. Swap the order of sending to
simplify life when the app just wants to pay attention to the AF done
callback during an active AF trigger.

Bug: 6243944
Change-Id: I127d1675bc37ef828ef89c70b8cfab75f9428a2f

2 files changed, 5 insertions, 5 deletions

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 @@ void Camera2Client::notifyAutoFocus(uint8_t newState, int triggerId) {
                 }
         }
     }
-    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) {
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 @@ status_t Camera2Device::dump(int fd, const Vector<String16>& args) {
         }
     }
 
-    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";