Revert "camera: Handle alternate face detection score"

* Use BOARD_FIX_FACE_DETECTION_SCORE instead.

This reverts commit 61d30cb4286ec7192107017f66eea8038e472219.

Change-Id: Iea651680421223c6ad92d70a3ec36445c20cc1fa

2 files changed, 1 insertions, 10 deletions

diff --git a/res/values/config.xml b/res/values/config.xml
index 74204a47e..25fd02d13 100644
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -54,6 +54,4 @@
     <bool name="enableVideoHDR">false</bool>
     <!-- Panorama focus mode.  Use FOCUS_MODE_INFINITY by default -->
     <bool name="useInfinityFocus">true</bool>
-    <!-- Face detection score is an error code -->
-    <bool name="faceScoreIsError">false</bool>
 </resources>
diff --git a/src/com/android/camera/ui/FaceView.java b/src/com/android/camera/ui/FaceView.java
index 90ae0e61a..1701efc39 100644
--- a/src/com/android/camera/ui/FaceView.java
+++ b/src/com/android/camera/ui/FaceView.java
@@ -66,8 +66,6 @@ public class FaceView extends View
     private Paint mPaint;
     private volatile boolean mBlocked;
 
-    private final boolean mFaceScoreIsError;
-
     private int mUncroppedWidth;
     private int mUncroppedHeight;
 
@@ -105,8 +103,6 @@ public class FaceView extends View
         mPaint.setDither(true);
         mPaint.setColor(Color.WHITE);//setColor(0xFFFFFF00);
         mPaint.setStrokeCap(Paint.Cap.ROUND);
-
-        mFaceScoreIsError = context.getResources().getBoolean(R.bool.faceScoreIsError);
     }
 
     public void setFaces(Face[] faces) {
@@ -224,10 +220,7 @@ public class FaceView extends View
             canvas.rotate(-mOrientation); // rotate is counter-clockwise (for canvas)
             for (int i = 0; i < mFaces.length; i++) {
               // Filter out false positives.
-              if (!mFaceScoreIsError && mFaces[i].score < 50)
-                  continue;
-              if (mFaceScoreIsError && mFaces[i].score > 0)
-                  continue;
+              if (mFaces[i].score < 50) continue;
 
               // Transform the coordinates.
               mRect.set(mFaces[i].rect);