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

# Via Igor Murashkin
* commit '4c645d0a9bd4721fe65f1c2264fed7a5830428a2':
  Camera2: Fix metadata symbols: DO NOT MERGE
This commit is contained in:
Igor Murashkin 2013-01-30 18:57:20 -08:00 committed by Android Git Automerger
commit 46e9befbe4

View file

@ -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);