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

Commit 000973a1 authored by Ruben Brunk's avatar Ruben Brunk
Browse files

Camera2: Ignore unsupported face detection results in LEGACY. 

Bug: 18261420
Change-Id: Ia50744326d7ade9c42292952c406c78d7f274769
parent 7fc9176c

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

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

                convertCameraAreaToActiveArrayRectangle(activeArray, zoomData, fakeArea);





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

        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 = convertCameraPointToActiveArrayPoint(activeArray, zoomData,

                    leftEye, /*usePreviewCrop*/true);

                    leftEye, /*usePreviewCrop*/true);

            rightEye = convertCameraPointToActiveArrayPoint(activeArray, zoomData,

            rightEye = convertCameraPointToActiveArrayPoint(activeArray, zoomData,