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

Commit 5f967a39 authored by Donghui Han's avatar Donghui Han
Browse files

camera2: Treat face detect mode larger than FULL as FULL 

This change treats any face detect mode larger than FULL mode
in the capture result as FULL mode. So in case the face detect
mode is larger than FULL, it is assumed that the FULL mode
STATISTICS_FACE is supported in the capture result.

Bug: 111131913
Test: CTS, GCA
Change-Id: I3a6a29ce8d9d8ab66918baaea3162797e18276d2
parent f00bfbe4

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];