commit bb39e1769e972e5f2405f05274ac2170b4e3c83f
author Igor Murashkin <iam@google.com> Tue Dec 04 16:54:52 2012 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Tue Dec 04 16:54:52 2012 -0800
tree aec1609f4dfe084ea549e84dbcc54a2b8301fe13
parent 9c78f43b7a3e0cd9d0ae46e058ec48e5d68bb9e5
parent 09ad0a3edb84404f56137963d78eccbf378fb48b

Merge "Camera2: Fix metadata symbols"

tests/camera2/camera2.cpp

diff --git a/tests/camera2/camera2.cpp b/tests/camera2/camera2.cpp
index fbb0503..a15c5e6 100644
--- a/tests/camera2/camera2.cpp
+++ b/tests/camera2/camera2.cpp
@@ -387,7 +387,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);
@@ -504,7 +504,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);
@@ -669,7 +669,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);