diff options
| author | Yin-Chia Yeh <yinchiayeh@google.com> | 2017-06-14 17:29:47 -0700 |
|---|---|---|
| committer | Yin-Chia Yeh <yinchiayeh@google.com> | 2017-06-15 14:27:13 -0700 |
| commit | 92d885b558d522d111e3a37b552f81b82529545e (patch) | |
| tree | 828faef0cc3790cb30502962b731ae6966496971 | |
| parent | dda2e8cdc29bd723434e9c09099f43db7246e73f (diff) | |
| download | android_hardware_interfaces-92d885b558d522d111e3a37b552f81b82529545e.tar.gz android_hardware_interfaces-92d885b558d522d111e3a37b552f81b82529545e.tar.bz2 android_hardware_interfaces-92d885b558d522d111e3a37b552f81b82529545e.zip | |
Camera: fix camera_metadata address expectation
On 32bits architecture, binder driver might allocate
non-8 bytes aligned buffers.
Test: compile (problem not reproducible on 64bit SOCs)
Bug: 62637461
Change-Id: I8ef2b3ecba783a8d189ebe18733082d32cff4899
| -rw-r--r-- | camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp b/camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp index c8e44d3d4..c350e31ae 100644 --- a/camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp +++ b/camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp @@ -1680,7 +1680,8 @@ TEST_F(CameraHidlTest, getCameraCharacteristics) { ASSERT_EQ(Status::OK, status); const camera_metadata_t* metadata = (camera_metadata_t*) chars.data(); size_t expectedSize = chars.size(); - ASSERT_EQ(0, validate_camera_metadata_structure(metadata, &expectedSize)); + int result = validate_camera_metadata_structure(metadata, &expectedSize); + ASSERT_TRUE(result == 0 || result == CAMERA_METADATA_VALIDATION_SHIFTED); size_t entryCount = get_camera_metadata_entry_count(metadata); // TODO: we can do better than 0 here. Need to check how many required // characteristics keys we've defined. @@ -1997,8 +1998,9 @@ TEST_F(CameraHidlTest, constructDefaultRequestSettings) { const camera_metadata_t* metadata = (camera_metadata_t*) req.data(); size_t expectedSize = req.size(); - ASSERT_EQ(0, validate_camera_metadata_structure( - metadata, &expectedSize)); + int result = validate_camera_metadata_structure( + metadata, &expectedSize); + ASSERT_TRUE(result == 0 || result == CAMERA_METADATA_VALIDATION_SHIFTED); size_t entryCount = get_camera_metadata_entry_count(metadata); // TODO: we can do better than 0 here. Need to check how many required // request keys we've defined for each template |