commit ed49d7b57e66cc2520817b345ef9de289d688bd4
author Igor Murashkin <iam@google.com> Wed May 22 19:54:28 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed May 22 19:54:28 2013 +0000
tree a30203eb74abdce9bdae94ffdbfb7ee669b3779d
parent c2c874d88df1b4be52f5415de6606785691bba1f
parent 82db9e6126812dd2ee74e33e4c475cae2c7e48f6

Merge "camera3: Fix recording failure when switching resolutions while preview on" into jb-mr2-dev

services/camera/libcameraservice/camera2/ZslProcessor3.cpp

diff --git a/services/camera/libcameraservice/camera2/ZslProcessor3.cpp b/services/camera/libcameraservice/camera2/ZslProcessor3.cpp
index defcafc..e2c120c 100644
--- a/services/camera/libcameraservice/camera2/ZslProcessor3.cpp
+++ b/services/camera/libcameraservice/camera2/ZslProcessor3.cpp
@@ -384,7 +384,7 @@
                 continue;
             }
             nsecs_t frameTimestamp = entry.data.i64[0];
-            if (minTimestamp > frameTimestamp) {
+            if (minTimestamp > frameTimestamp || minTimestamp == -1) {
 
                 entry = frame.find(ANDROID_CONTROL_AE_STATE);
                 if (entry.count == 0) {