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

Commit 1b1cb30d authored by Igor Murashkin's avatar Igor Murashkin Committed by Android (Google) Code Review
Browse files

Merge "camera2: Fix CameraMetadata#getKeys" into klp-dev

parents 02cefe27 03fdb14b
Loading
Loading
Loading
Loading
+4 −1
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ package android.hardware.camera2;
import android.hardware.camera2.impl.CameraMetadataNative;

import java.lang.reflect.Field;
import java.lang.reflect.Modifier;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
@@ -105,7 +106,9 @@ public abstract class CameraMetadata {

        Field[] fields = type.getDeclaredFields();
        for (Field field : fields) {
            if (field.getDeclaringClass().isAssignableFrom(Key.class)) {
            // Filter for Keys that are public
            if (field.getType().isAssignableFrom(Key.class) &&
                    (field.getModifiers() & Modifier.PUBLIC) != 0) {
                Key<?> key;
                try {
                    key = (Key<?>) field.get(instance);
+5 −0
Original line number Diff line number Diff line
@@ -60,6 +60,11 @@ public final class CaptureResult extends CameraMetadata {

    @Override
    public <T> T get(Key<T> key) {
        if (key == STATISTICS_FACES) { // Don't throw IllegalArgumentException
            // TODO: Implement android.statistics.faces
            return null;
        }

        return mResults.get(key);
    }