Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

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

# Via Igor Murashkin
* commit '4c645d0a9bd4721fe65f1c2264fed7a5830428a2':
  Camera2: Fix metadata symbols: DO NOT MERGE
  • Loading branch information...
commit 46e9befbe45e0d53c7ad1cb0f570865c08335aab 2 parents e073165 + 4c645d0
Igor Murashkin authored Android Git Automerger committed
Showing with 3 additions and 3 deletions.
  1. +3 −3 tests/camera2/camera2.cpp
6 tests/camera2/camera2.cpp
View
@@ -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);
Please sign in to comment.
Something went wrong with that request. Please try again.