diff options
author | joshmccloskey | 2018-05-25 18:43:58 -0500 |
---|---|---|
committer | Joshua Mccloskey | 2018-05-29 16:44:10 -0500 |
commit | 7897d0f57331b6bcb2d3bc8c2fd6d0e862b860e6 (patch) | |
tree | a2496e7e0657ecef55e4fa98e861fe9d94226f29 /biometrics | |
parent | de0e5293bd68b5956561c9e2547b9d61a08154ba (diff) | |
download | platform-hardware-interfaces-7897d0f57331b6bcb2d3bc8c2fd6d0e862b860e6.tar.gz platform-hardware-interfaces-7897d0f57331b6bcb2d3bc8c2fd6d0e862b860e6.tar.xz platform-hardware-interfaces-7897d0f57331b6bcb2d3bc8c2fd6d0e862b860e6.zip |
Modified tests to account for different directories being used based on
different first API levels
Fixes: 80028983
Test: Ran tests on P17 and P18
Change-Id: I2752c5b8e15dc5e3ee386b0079a75b482a21543f
Diffstat (limited to 'biometrics')
-rw-r--r-- | biometrics/fingerprint/2.1/vts/functional/VtsHalBiometricsFingerprintV2_1TargetTest.cpp | 26 |
1 files changed, 22 insertions, 4 deletions
diff --git a/biometrics/fingerprint/2.1/vts/functional/VtsHalBiometricsFingerprintV2_1TargetTest.cpp b/biometrics/fingerprint/2.1/vts/functional/VtsHalBiometricsFingerprintV2_1TargetTest.cpp index a7f40319..9911038a 100644 --- a/biometrics/fingerprint/2.1/vts/functional/VtsHalBiometricsFingerprintV2_1TargetTest.cpp +++ b/biometrics/fingerprint/2.1/vts/functional/VtsHalBiometricsFingerprintV2_1TargetTest.cpp | |||
@@ -19,6 +19,7 @@ | |||
19 | #include <VtsHalHidlTargetTestBase.h> | 19 | #include <VtsHalHidlTargetTestBase.h> |
20 | #include <VtsHalHidlTargetTestEnvBase.h> | 20 | #include <VtsHalHidlTargetTestEnvBase.h> |
21 | #include <android-base/logging.h> | 21 | #include <android-base/logging.h> |
22 | #include <android-base/properties.h> | ||
22 | #include <android/hardware/biometrics/fingerprint/2.1/IBiometricsFingerprint.h> | 23 | #include <android/hardware/biometrics/fingerprint/2.1/IBiometricsFingerprint.h> |
23 | #include <android/hardware/biometrics/fingerprint/2.1/IBiometricsFingerprintClientCallback.h> | 24 | #include <android/hardware/biometrics/fingerprint/2.1/IBiometricsFingerprintClientCallback.h> |
24 | #include <hidl/HidlSupport.h> | 25 | #include <hidl/HidlSupport.h> |
@@ -28,6 +29,7 @@ | |||
28 | #include <future> | 29 | #include <future> |
29 | #include <utility> | 30 | #include <utility> |
30 | 31 | ||
32 | using android::base::GetUintProperty; | ||
31 | using android::Condition; | 33 | using android::Condition; |
32 | using android::hardware::biometrics::fingerprint::V2_1::IBiometricsFingerprint; | 34 | using android::hardware::biometrics::fingerprint::V2_1::IBiometricsFingerprint; |
33 | using android::hardware::biometrics::fingerprint::V2_1::IBiometricsFingerprintClientCallback; | 35 | using android::hardware::biometrics::fingerprint::V2_1::IBiometricsFingerprintClientCallback; |
@@ -44,7 +46,7 @@ namespace { | |||
44 | static const uint32_t kTimeout = 3; | 46 | static const uint32_t kTimeout = 3; |
45 | static const std::chrono::seconds kTimeoutInSeconds = std::chrono::seconds(kTimeout); | 47 | static const std::chrono::seconds kTimeoutInSeconds = std::chrono::seconds(kTimeout); |
46 | static const uint32_t kGroupId = 99; | 48 | static const uint32_t kGroupId = 99; |
47 | static const std::string kTmpDir = "/data/system/users/0/fpdata/"; | 49 | static std::string kTmpDir = ""; |
48 | static const uint32_t kIterations = 1000; | 50 | static const uint32_t kIterations = 1000; |
49 | 51 | ||
50 | // Wait for a callback to occur (signaled by the given future) up to the | 52 | // Wait for a callback to occur (signaled by the given future) up to the |
@@ -199,9 +201,25 @@ class FingerprintHidlTest : public ::testing::VtsHalHidlTargetTestBase { | |||
199 | FingerprintHidlEnvironment::Instance()->getServiceName<IBiometricsFingerprint>()); | 201 | FingerprintHidlEnvironment::Instance()->getServiceName<IBiometricsFingerprint>()); |
200 | ASSERT_FALSE(mService == nullptr); | 202 | ASSERT_FALSE(mService == nullptr); |
201 | 203 | ||
202 | // Create an active group | 204 | /* |
203 | // FP service can only write to /data/system/users/*/fpdata/ due to | 205 | * Devices shipped from now on will instead store |
204 | // SELinux Policy and Linux Dir Permissions | 206 | * fingerprint data under /data/vendor_de/<user-id>/fpdata. |
207 | * Support for /data/vendor_de and /data/vendor_ce has been added to vold. | ||
208 | */ | ||
209 | |||
210 | uint64_t api_level = GetUintProperty<uint64_t>("ro.product.first_api_level", 0); | ||
211 | if (api_level == 0) { | ||
212 | api_level = GetUintProperty<uint64_t>("ro.build.version.sdk", 0); | ||
213 | } | ||
214 | ASSERT_TRUE(api_level != 0); | ||
215 | |||
216 | // 27 is the API number for O-MR1 | ||
217 | if (api_level <= 27) { | ||
218 | kTmpDir = "/data/system/users/0/fpdata/"; | ||
219 | } else { | ||
220 | kTmpDir = "/data/vendor_de/0/fpdata/"; | ||
221 | } | ||
222 | |||
205 | Return<RequestStatus> res = mService->setActiveGroup(kGroupId, kTmpDir); | 223 | Return<RequestStatus> res = mService->setActiveGroup(kGroupId, kTmpDir); |
206 | ASSERT_EQ(RequestStatus::SYS_OK, static_cast<RequestStatus>(res)); | 224 | ASSERT_EQ(RequestStatus::SYS_OK, static_cast<RequestStatus>(res)); |
207 | } | 225 | } |