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 
am: 2fca393cc1

Change-Id: I77b6b8e6d469a9e28478ddd7975f9c065caef20b
This commit is contained in:
Donghui Han
2018-07-12 10:47:53 -07:00
committed by android-build-merger
parent 0ef27dac21 2fca393cc1
commit d05d630060
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];