am 46d5f094: Merge "CameraITS: allow more time for AE converge" into lmp-sprout-dev

* commit '46d5f09474f3247bbd914627d4f4b02219233421':
  CameraITS: allow more time for AE converge
diff --git a/apps/CameraITS/tests/scene1/test_ae_precapture_trigger.py b/apps/CameraITS/tests/scene1/test_ae_precapture_trigger.py
index b1f51f3..563cebd 100644
--- a/apps/CameraITS/tests/scene1/test_ae_precapture_trigger.py
+++ b/apps/CameraITS/tests/scene1/test_ae_precapture_trigger.py
@@ -17,6 +17,9 @@
 import its.objects
 import its.target
 
+# AE must converge within this number of auto requests under scene1
+THRESH_AE_CONVERGE = 8
+
 def main():
     """Test the AE state machine when using the precapture trigger.
     """
@@ -68,7 +71,7 @@
 
         # Capture some more auto requests, and AE should converge.
         auto_req['android.control.aePrecaptureTrigger'] = 0
-        caps = cam.do_capture([auto_req]*5, fmt)
+        caps = cam.do_capture([auto_req] * THRESH_AE_CONVERGE, fmt)
         state = caps[-1]['metadata']['android.control.aeState']
         print "AE state after auto request:", state
         assert(state == CONVERGED)