diff options
| author | Igor Murashkin <iam@google.com> | 2013-01-30 18:57:20 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-01-30 18:57:20 -0800 |
| commit | 46e9befbe45e0d53c7ad1cb0f570865c08335aab (patch) | |
| tree | 165e040c73f9f3666612ca78b13c24b722e4d5ce | |
| parent | e073165389625fcb54c4d6b2565a6ada2d125048 (diff) | |
| parent | 4c645d0a9bd4721fe65f1c2264fed7a5830428a2 (diff) | |
| download | libhardware-tools_r22.tar.gz | |
am 4c645d0a: Camera2: Fix metadata symbols: DO NOT MERGEtools_r22jb-mr1.1-dev-plus-aosp
# Via Igor Murashkin
* commit '4c645d0a9bd4721fe65f1c2264fed7a5830428a2':
Camera2: Fix metadata symbols: DO NOT MERGE
| -rw-r--r-- | tests/camera2/camera2.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/camera2/camera2.cpp b/tests/camera2/camera2.cpp index 3580b9bc..78e82aff 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); |