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

Commit 3f7da6a3 authored by Igor Murashkin's avatar Igor Murashkin Committed by Android Git Automerger
Browse files

am b7354bab: am c8093826: am 46ea9b0b: Merge "camera2: Workaround for null... 

am b7354bab: am c8093826: am 46ea9b0b: Merge "camera2: Workaround for null FACE_DETECT_MODE crashing" into klp-dev

* commit 'b7354bab':
  camera2: Workaround for null FACE_DETECT_MODE crashing
parents ab0330f2 b7354bab

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

+9 −0
Original line number Diff line number Diff line
@@ -92,6 +92,15 @@ public class CameraMetadataNative extends CameraMetadata implements Parcelable { 
    @SuppressWarnings("unchecked")

    @Override

    public <T> T get(Key<T> key) {



        if (key == CaptureResult.STATISTICS_FACES) {

            /**

             * FIXME: Workaround for HAL bug that's missing FACE_DETECT_MODE

             */

            Log.w(TAG, "Expected non-null android.statistics.faceDetectMode");

            return null;

        }



        T value = getOverride(key);

        if (value != null) {

            return value;