commit 84cca777e2c8dafc24bb1c7687f777b35d0b0ae0
author Ruben Brunk <rubenbrunk@google.com> Thu Jul 17 18:12:08 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jul 17 18:11:21 2014 +0000
tree f3479ef19501b7824ed6f07259051e47e8c8f473
parent 69eef8a0d250ae1b50b510499014e109bd2c6112
parent 40001f5dac10c8b71af5ef051dc1a95d58bea743

Merge "camera2: Fix swapped Face detection commands." into lmp-dev

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

diff --git a/core/java/android/hardware/camera2/impl/CameraMetadataNative.java b/core/java/android/hardware/camera2/impl/CameraMetadataNative.java
index ebab563..ec1fc4a 100644
--- a/core/java/android/hardware/camera2/impl/CameraMetadataNative.java
+++ b/core/java/android/hardware/camera2/impl/CameraMetadataNative.java
@@ -475,7 +475,7 @@
                     @Override
                     @SuppressWarnings("unchecked")
                     public <T> T getValue(CameraMetadataNative metadata, Key<T> key) {
-                        return (T) metadata.getFaceRectangles();
+                        return (T) metadata.getFaces();
                     }
                 });
         sGetCommandMap.put(
@@ -483,7 +483,7 @@
                     @Override
                     @SuppressWarnings("unchecked")
                     public <T> T getValue(CameraMetadataNative metadata, Key<T> key) {
-                        return (T) metadata.getFaces();
+                        return (T) metadata.getFaceRectangles();
                     }
                 });
         sGetCommandMap.put(