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

Commit ebc6cb38 authored by Donghui Han's avatar Donghui Han Committed by android-build-merger
Browse files

Merge "camera2: Treat face detect mode larger than FULL as FULL" into pi-dev am: 2fca393c 

am: d05d6300

Change-Id: I3947264d88d0c558f8c7fb5ee22160af934e411e
parents 71fa53f8 d05d6300

core/java/android/hardware/camera2/impl/CameraMetadataNative.java

+3 −0
Original line number Diff line number Diff line
@@ -747,6 +747,9 @@ public class CameraMetadataNative implements Parcelable { 
        if (faceDetectMode == null) {

            Log.w(TAG, "Face detect mode metadata is null, assuming the mode is SIMPLE");

            faceDetectMode = CaptureResult.STATISTICS_FACE_DETECT_MODE_SIMPLE;

        } else if (faceDetectMode > CaptureResult.STATISTICS_FACE_DETECT_MODE_FULL) {

            // Face detect mode is larger than FULL, assuming the mode is FULL

            faceDetectMode = CaptureResult.STATISTICS_FACE_DETECT_MODE_FULL;

        } else {

            if (faceDetectMode == CaptureResult.STATISTICS_FACE_DETECT_MODE_OFF) {

                return new Face[0];