commit 9554065f5b9afc6a6c2b91f94fd7fea09bd4836e
author Ruben Brunk <rubenbrunk@google.com> Wed May 13 19:59:35 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed May 13 19:59:35 2015 +0000
tree 069323eeaeddde8c6ab1d2526a7f56d7dc90cf21
parent 44d00c7f9a1a5970959ab98ef31982a8a3e9639e
parent f80a32e60589157b1db0f11e4ed381fe29f9fa23

am f80a32e6: am e92d9bd1: am aefcae4d: Merge "camera2 CTS: Wait for session close callbacks before teardown." into lollipop-mr1-cts-dev

* commit 'f80a32e60589157b1db0f11e4ed381fe29f9fa23':
  camera2 CTS: Wait for session close callbacks before teardown.

tests/tests/hardware/src/android/hardware/camera2/cts/PerformanceTest.java

diff --git a/tests/tests/hardware/src/android/hardware/camera2/cts/PerformanceTest.java b/tests/tests/hardware/src/android/hardware/camera2/cts/PerformanceTest.java
index d4a0e73..124c5b0 100644
--- a/tests/tests/hardware/src/android/hardware/camera2/cts/PerformanceTest.java
+++ b/tests/tests/hardware/src/android/hardware/camera2/cts/PerformanceTest.java
@@ -252,7 +252,7 @@
                     // simulate real scenario (preview runs a bit)
                     waitForNumResults(previewResultListener, NUM_RESULTS_WAIT);
 
-                    stopPreview();
+                    blockingStopPreview();
 
                 }
                 mReportLog.printArray("Camera " + id