Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Donghui Han
2018-07-12 17:19:36 +00:00
committed by Android (Google) Code Review
parent 267b960dab 5f967a3941
commit 2fca393cc1
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java/android/hardware/camera2/impl/CameraMetadataNative.java
View File

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