commit 83d04cac0e5bbe5dcdd7f9b05cf15efb46fa4451
author Wei Huang <weih@google.com> Wed May 30 09:24:59 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Wed May 30 09:24:59 2012 -0700
tree b6d2326d534013ffa064097af35d6c277f294cef
parent 19f7e89127e2af4a237217d4a33dd931bd342c8e
parent cae69bb694d26d288229a256511ccf2488956358

Merge "Add a camera face detection test." into jb-dev

tests/tests/hardware/src/android/hardware/cts/CameraTest.java

diff --git a/tests/tests/hardware/src/android/hardware/cts/CameraTest.java b/tests/tests/hardware/src/android/hardware/cts/CameraTest.java
index d98d296..934e46b 100755
--- a/tests/tests/hardware/src/android/hardware/cts/CameraTest.java
+++ b/tests/tests/hardware/src/android/hardware/cts/CameraTest.java
@@ -2622,6 +2622,16 @@
         for (Face[] faces: listener.mFacesArray) {
             testFaces(faces, maxNumOfFaces, optionalFieldSupported);
         }
+
+        // After taking a picture, face detection should be started again.
+        initializeMessageLooper(cameraId);
+        mCamera.startPreview();
+        mCamera.startFaceDetection();
+        mCamera.takePicture(mShutterCallback, mRawPictureCallback, mJpegPictureCallback);
+        waitForSnapshotDone();
+        mCamera.startPreview();
+        mCamera.startFaceDetection();
+        terminateMessageLooper();
     }
 
     private class FaceListener implements FaceDetectionListener {