Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c02cdf00 authored by Ruben Brunk's avatar Ruben Brunk Committed by Android Git Automerger
Browse files

am 8791a1e8: Merge "Camera2: Ignore unsupported face detection results in LEGACY." into lmp-mr1-dev 

* commit '8791a1e8':
  Camera2: Ignore unsupported face detection results in LEGACY.
parents f07a99f9 8791a1e8

core/java/android/hardware/camera2/legacy/ParameterUtils.java

+3 −1
Original line number Diff line number Diff line
@@ -918,7 +918,9 @@ public class ParameterUtils { 
                convertCameraAreaToActiveArrayRectangle(activeArray, zoomData, fakeArea);



        Point leftEye = face.leftEye, rightEye = face.rightEye, mouth = face.mouth;

        if (leftEye != null && rightEye != null && mouth != null) {

        if (leftEye != null && rightEye != null && mouth != null && leftEye.x != -2000 &&

                leftEye.y != -2000 && rightEye.x != -2000 && rightEye.y != -2000 &&

                mouth.x != -2000 && mouth.y != -2000) {

            leftEye = convertCameraPointToActiveArrayPoint(activeArray, zoomData,

                    leftEye, /*usePreviewCrop*/true);

            rightEye = convertCameraPointToActiveArrayPoint(activeArray, zoomData,