commit 8772d942d2430616c2d97093f801d383e16f867c
author Igor Murashkin <iam@google.com> Thu Jul 31 15:53:01 2014 -0700
committer Igor Murashkin <iam@google.com> Mon Aug 04 21:55:20 2014 +0000
tree 4cbd0d73610f617cb7dc7695eac928b5fcbc3841
parent 6aab80dabe43420a4f657083dc8e621c35495e15

camera2: Fix testFaceDetection for non-full devices

Change-Id: I2f0a80f1d580af214cb0f53abcbf33c7391790f1

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

diff --git a/tests/tests/hardware/src/android/hardware/camera2/cts/CaptureRequestTest.java b/tests/tests/hardware/src/android/hardware/camera2/cts/CaptureRequestTest.java
index a62b92e..cf70b52 100644
--- a/tests/tests/hardware/src/android/hardware/camera2/cts/CaptureRequestTest.java
+++ b/tests/tests/hardware/src/android/hardware/camera2/cts/CaptureRequestTest.java
@@ -1221,9 +1221,6 @@
     private void faceDetectionTestByCamera() throws Exception {
         // Can only test full capability because test relies on per frame control
         // and synchronization.
-        if (!mStaticInfo.isHardwareLevelFull()) {
-            return;
-        }
         int[] faceDetectModes = mStaticInfo.getAvailableFaceDetectModesChecked();
 
         SimpleCaptureListener listener;
@@ -1241,6 +1238,7 @@
             // into another run.
             listener = new SimpleCaptureListener();
             startPreview(requestBuilder, maxPreviewSz, listener);
+            waitForSettingsApplied(listener, NUM_FRAMES_WAITED_FOR_UNKNOWN_LATENCY);
             verifyFaceDetectionResults(listener, NUM_FACE_DETECTION_FRAMES_VERIFIED, mode);
         }
 
@@ -1280,7 +1278,7 @@
                 }
 
                 for (Face face : faces) {
-                    Rect faceBound = null;
+                    Rect faceBound;
                     boolean faceRectAvailable =  mCollector.expectTrue("Face rectangle "
                             + "shouldn't be null", face.getBounds() != null);
                     if (!faceRectAvailable) {
@@ -1305,20 +1303,20 @@
                     // Eyes/mouth position should be inside of the face rect.
                     if (leftEyeAvailable) {
                         Point leftEye = face.getLeftEyePosition();
-                        mCollector.expectTrue("Left eye " + leftEye.toString() + "should be"
-                                + "inside of face rect " + faceBound.toString(),
+                        mCollector.expectTrue("Left eye " + leftEye + "should be"
+                                + "inside of face rect " + faceBound,
                                 faceBound.contains(leftEye.x, leftEye.y));
                     }
                     if (rightEyeAvailable) {
                         Point rightEye = face.getRightEyePosition();
-                        mCollector.expectTrue("Right eye " + rightEye.toString() + "should be"
-                                + "inside of face rect " + faceBound.toString(),
+                        mCollector.expectTrue("Right eye " + rightEye + "should be"
+                                + "inside of face rect " + faceBound,
                                 faceBound.contains(rightEye.x, rightEye.y));
                     }
                     if (mouthAvailable) {
                         Point mouth = face.getMouthPosition();
-                        mCollector.expectTrue("Mouth " + mouth.toString() +  " should be inside of"
-                                + " face rect " + faceBound.toString(),
+                        mCollector.expectTrue("Mouth " + mouth +  " should be inside of"
+                                + " face rect " + faceBound,
                                 faceBound.contains(mouth.x, mouth.y));
                     }
                 }