commit 46e9befbe45e0d53c7ad1cb0f570865c08335aab
author Igor Murashkin <iam@google.com> Wed Jan 30 18:57:20 2013 -0800
committer Android Git Automerger <android-git-automerger@android.com> Wed Jan 30 18:57:20 2013 -0800
tree 165e040c73f9f3666612ca78b13c24b722e4d5ce
parent e073165389625fcb54c4d6b2565a6ada2d125048
parent 4c645d0a9bd4721fe65f1c2264fed7a5830428a2

am 4c645d0a: Camera2: Fix metadata symbols: DO NOT MERGE

# Via Igor Murashkin
* commit '4c645d0a9bd4721fe65f1c2264fed7a5830428a2':
  Camera2: Fix metadata symbols: DO NOT MERGE

tests/camera2/camera2.cpp

diff --git a/tests/camera2/camera2.cpp b/tests/camera2/camera2.cpp
index 3580b9b..78e82af 100644
--- a/tests/camera2/camera2.cpp
+++ b/tests/camera2/camera2.cpp
@@ -407,7 +407,7 @@
         camera_metadata_t *request;
         request = allocate_camera_metadata(20, 2000);
 
-        uint8_t metadataMode = ANDROID_REQUEST_METADATA_FULL;
+        uint8_t metadataMode = ANDROID_REQUEST_METADATA_MODE_FULL;
         add_camera_metadata_entry(request,
                 ANDROID_REQUEST_METADATA_MODE,
                 (void**)&metadataMode, 1);
@@ -529,7 +529,7 @@
         camera_metadata_t *request;
         request = allocate_camera_metadata(20, 2000);
 
-        uint8_t metadataMode = ANDROID_REQUEST_METADATA_FULL;
+        uint8_t metadataMode = ANDROID_REQUEST_METADATA_MODE_FULL;
         add_camera_metadata_entry(request,
                 ANDROID_REQUEST_METADATA_MODE,
                 (void**)&metadataMode, 1);
@@ -698,7 +698,7 @@
         camera_metadata_t *request;
         request = allocate_camera_metadata(20, 2000);
 
-        uint8_t metadataMode = ANDROID_REQUEST_METADATA_FULL;
+        uint8_t metadataMode = ANDROID_REQUEST_METADATA_MODE_FULL;
         add_camera_metadata_entry(request,
                 ANDROID_REQUEST_METADATA_MODE,
                 (void**)&metadataMode, 1);