commit 0cc754918a3c1353164ccc5798f63b28f65db406
author Eino-Ville Talvala <etalvala@google.com> Fri Jun 14 08:35:48 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Fri Jun 14 08:35:48 2013 -0700
tree 17ae714410130417129ae3122f024bc2df2bc412
parent e4a453d4b7563d1dab674df6ce52c291e63c6ca7
parent 26bc908b3dafb5d80f092a22c5c71116526eae06

am 26bc908b: Camera2/3: Make sure to wait for idle after still capture.

* commit '26bc908b3dafb5d80f092a22c5c71116526eae06':
  Camera2/3: Make sure to wait for idle after still capture.

services/camera/libcameraservice/camera2/CaptureSequencer.cpp

diff --git a/services/camera/libcameraservice/camera2/CaptureSequencer.cpp b/services/camera/libcameraservice/camera2/CaptureSequencer.cpp
index 266e516..e5a011c 100644
--- a/services/camera/libcameraservice/camera2/CaptureSequencer.cpp
+++ b/services/camera/libcameraservice/camera2/CaptureSequencer.cpp
@@ -253,6 +253,12 @@
                 res = INVALID_OPERATION;
                 break;
             case Parameters::STILL_CAPTURE:
+                res = client->getCameraDevice()->waitUntilDrained();
+                if (res != OK) {
+                    ALOGE("%s: Camera %d: Can't idle after still capture: "
+                            "%s (%d)", __FUNCTION__, client->getCameraId(),
+                            strerror(-res), res);
+                }
                 l.mParameters.state = Parameters::STOPPED;
                 break;
             case Parameters::VIDEO_SNAPSHOT: