From 4c645d0a9bd4721fe65f1c2264fed7a5830428a2 Mon Sep 17 00:00:00 2001
From: Igor Murashkin <iam@google.com>
Date: Mon, 3 Dec 2012 13:33:08 -0800
Subject: [PATCH] Camera2: Fix metadata symbols: DO NOT MERGE

Change-Id: I5d7c8416b8ed8effca699aa9e51068f5678927ea
---
 tests/camera2/camera2.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/camera2/camera2.cpp b/tests/camera2/camera2.cpp
index 3580b9bc2..78e82affb 100644
--- a/tests/camera2/camera2.cpp
+++ b/tests/camera2/camera2.cpp
@@ -407,7 +407,7 @@ TEST_F(Camera2Test, Capture1Raw) {
         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 @@ TEST_F(Camera2Test, CaptureBurstRaw) {
         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 @@ TEST_F(Camera2Test, Capture1Jpeg) {
         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);