9 files changed, 11 insertions, 11 deletions
diff --git a/apps/CameraITS/tests/inprog/test_blc_lsc.py b/apps/CameraITS/tests/inprog/test_blc_lsc.py
index 091c4e4..ce120a2 100644
--- a/apps/CameraITS/tests/inprog/test_blc_lsc.py
+++ b/apps/CameraITS/tests/inprog/test_blc_lsc.py
@@ -39,8 +39,8 @@ def main():
         # Get AE+AWB lock first, so the auto values in the capture result are
         # populated properly.
         r = [[0,0,1,1,1]]
-        ae_sen,ae_exp,awb_gains,awb_transform,_ = \
-                cam.do_3a(r,r,r,True,True,False)
+        ae_sen,ae_exp,awb_gains,awb_transform,_ \
+                = cam.do_3a(r,r,r,do_af=False,get_results=True)
         print "AE:", ae_sen, ae_exp / 1000000.0
         print "AWB:", awb_gains, awb_transform
 
diff --git a/apps/CameraITS/tests/inprog/test_param_edge_mode.py b/apps/CameraITS/tests/inprog/test_param_edge_mode.py
index 80d78c7..e928f21 100644
--- a/apps/CameraITS/tests/inprog/test_param_edge_mode.py
+++ b/apps/CameraITS/tests/inprog/test_param_edge_mode.py
@@ -36,7 +36,7 @@ def main():
         }
 
     with its.device.ItsSession() as cam:
-        sens, exp, gains, xform, focus = cam.do_3a()
+        sens, exp, gains, xform, focus = cam.do_3a(get_results=True)
         for e in [0,1,2]:
             req["android.edge.mode"] = e
             cap = cam.do_capture(req)
diff --git a/apps/CameraITS/tests/scene1/test_3a.py b/apps/CameraITS/tests/scene1/test_3a.py
index 6cb8b51..b53fc73 100644
--- a/apps/CameraITS/tests/scene1/test_3a.py
+++ b/apps/CameraITS/tests/scene1/test_3a.py
@@ -27,7 +27,7 @@ def main():
             print "Test skipped"
             return
 
-        sens, exp, gains, xform, focus = cam.do_3a()
+        sens, exp, gains, xform, focus = cam.do_3a(get_results=True)
         print "AE: sensitivity %d, exposure %dms" % (sens, exp/1000000)
         print "AWB: gains", gains, "transform", xform
         print "AF: distance", focus
diff --git a/apps/CameraITS/tests/scene1/test_auto_vs_manual.py b/apps/CameraITS/tests/scene1/test_auto_vs_manual.py
index 01a373c..a9d5ce4 100644
--- a/apps/CameraITS/tests/scene1/test_auto_vs_manual.py
+++ b/apps/CameraITS/tests/scene1/test_auto_vs_manual.py
@@ -38,7 +38,7 @@ def main():
             return
 
         # Converge 3A and get the estimates.
-        sens, exp, gains, xform, focus = cam.do_3a()
+        sens, exp, gains, xform, focus = cam.do_3a(get_results=True)
         xform_rat = its.objects.float_to_rational(xform)
         print "AE sensitivity %d, exposure %dms" % (sens, exp/1000000.0)
         print "AWB gains", gains
@@ -85,7 +85,7 @@ def main():
         print "Manual wb+tm transform:", xform_m2
 
         # Check that the WB gains and transform reported in each capture
-        # result math with the original AWB estimate from do_3a.
+        # result match with the original AWB estimate from do_3a.
         for g,x in [(gains_a,xform_a),(gains_m1,xform_m1),(gains_m2,xform_m2)]:
             assert(all([abs(xform[i] - x[i]) < 0.05 for i in range(9)]))
             assert(all([abs(gains[i] - g[i]) < 0.05 for i in range(4)]))
diff --git a/apps/CameraITS/tests/scene1/test_capture_result.py b/apps/CameraITS/tests/scene1/test_capture_result.py
index ee3c91c..304e811 100644
--- a/apps/CameraITS/tests/scene1/test_capture_result.py
+++ b/apps/CameraITS/tests/scene1/test_capture_result.py
@@ -109,7 +109,7 @@ def test_auto(cam, w_map, h_map):
     # Get 3A lock first, so the auto values in the capture result are
     # populated properly.
     rect = [[0,0,1,1,1]]
-    cam.do_3a(rect, rect, rect, True, True, False)
+    cam.do_3a(rect, rect, rect, do_af=False)
 
     cap = cam.do_capture(auto_req)
     cap_res = cap["metadata"]
diff --git a/apps/CameraITS/tests/scene1/test_raw_burst_sensitivity.py b/apps/CameraITS/tests/scene1/test_raw_burst_sensitivity.py
index bc304c9..bf0e2ea 100644
--- a/apps/CameraITS/tests/scene1/test_raw_burst_sensitivity.py
+++ b/apps/CameraITS/tests/scene1/test_raw_burst_sensitivity.py
@@ -46,7 +46,7 @@ def main():
         # Expose for the scene with min sensitivity
         sens_min, sens_max = props['android.sensor.info.sensitivityRange']
         sens_step = (sens_max - sens_min) / NUM_STEPS
-        s_ae,e_ae,_,_,_  = cam.do_3a()
+        s_ae,e_ae,_,_,_  = cam.do_3a(get_results=True)
         s_e_prod = s_ae * e_ae
 
         reqs = []
diff --git a/apps/CameraITS/tests/scene1/test_raw_sensitivity.py b/apps/CameraITS/tests/scene1/test_raw_sensitivity.py
index 7c8eccd..8e36219 100644
--- a/apps/CameraITS/tests/scene1/test_raw_sensitivity.py
+++ b/apps/CameraITS/tests/scene1/test_raw_sensitivity.py
@@ -44,7 +44,7 @@ def main():
         # Expose for the scene with min sensitivity
         sens_min, sens_max = props['android.sensor.info.sensitivityRange']
         sens_step = (sens_max - sens_min) / NUM_STEPS
-        s_ae,e_ae,_,_,_  = cam.do_3a()
+        s_ae,e_ae,_,_,_  = cam.do_3a(get_results=True)
         s_e_prod = s_ae * e_ae
 
         variances = []
diff --git a/apps/CameraITS/tests/scene1/test_tonemap_sequence.py b/apps/CameraITS/tests/scene1/test_tonemap_sequence.py
index 100bcf8..7af51c5 100644
--- a/apps/CameraITS/tests/scene1/test_tonemap_sequence.py
+++ b/apps/CameraITS/tests/scene1/test_tonemap_sequence.py
@@ -36,7 +36,7 @@ def main():
             print "Test skipped"
             return
 
-        sens, exp_time, _,_,_ = cam.do_3a(do_af=False)
+        sens, exp_time, _,_,_ = cam.do_3a(do_af=False,get_results=True)
 
         means = []
 
diff --git a/apps/CameraITS/tests/tutorial.py b/apps/CameraITS/tests/tutorial.py
index 606b77e..1b1999e 100644
--- a/apps/CameraITS/tests/tutorial.py
+++ b/apps/CameraITS/tests/tutorial.py
@@ -97,7 +97,7 @@ def main():
         #
         # If this keeps on failing, try also rebooting the device before
         # running the test.
-        sens, exp, gains, xform, focus = cam.do_3a()
+        sens, exp, gains, xform, focus = cam.do_3a(get_results=True)
         print "AE: sensitivity %d, exposure %dms" % (sens, exp/1000000.0)
         print "AWB: gains", gains, "transform", xform
         print "AF: distance", focus