Merge "Camera3: Make sure new metadata results signal other threads waiting" into...

diff --cc services/camera/libcameraservice/camera2/ZslProcessor3.cpp
index e2c120c,f94b746..af3e266
--- 1/services/camera/libcameraservice/camera2/ZslProcessor3.cpp
--- 2/services/camera/libcameraservice/camera2/ZslProcessor3.cpp
+++ b/services/camera/libcameraservice/camera2/ZslProcessor3.cpp
@@@ -384,10 -390,15 +390,15 @@@ nsecs_t ZslProcessor3::getCandidateTime
                  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) {
+                     /**
+                      * This is most likely a HAL bug. The aeState field is
+                      * mandatory, so it should always be in a metadata packet.
+                      */
                      ALOGW("%s: ZSL queue frame has no AE state field!",
                              __FUNCTION__);
                      continue;