commit f89631e1d86ca0b5099c042c41b546f6ac6e3d31
author Ruben Brunk <rubenbrunk@google.com> Thu Jul 17 21:05:47 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Jul 17 21:05:47 2014 +0000
tree b07282a40fe0d8678bae1d4b4d3d3a534c9361bc
parent 58ba7f7f07e126275dd5447e1ba78f8ddfd06026
parent e5d53bd1ba187af5fd49cfc97cc66d569bfec168

am b66e3aae: am ff8ea9c5: am 0a749af3: Merge "camera2: Fix swapped Face detection commands." into lmp-dev

* commit 'b66e3aae34e2ad9a5a6b9b5904f1ca4ebc101a73':
  camera2: Fix swapped Face detection commands.

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(