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

2 files changed, 9 insertions, 1 deletions

diff --git a/core/java/android/hardware/camera2/CameraMetadata.java b/core/java/android/hardware/camera2/CameraMetadata.java
index be556c3d8543..1d6ff7db869b 100644
--- a/core/java/android/hardware/camera2/CameraMetadata.java
+++ b/core/java/android/hardware/camera2/CameraMetadata.java
@@ -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);
diff --git a/core/java/android/hardware/camera2/CaptureResult.java b/core/java/android/hardware/camera2/CaptureResult.java
index 30bffc45c9f9..c9626f1b074e 100644
--- a/core/java/android/hardware/camera2/CaptureResult.java
+++ b/core/java/android/hardware/camera2/CaptureResult.java
@@ -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);
     }