Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 245ae95a authored by Tri Vo's avatar Tri Vo Committed by android-build-merger
Browse files

Merge "Change tmp dir to /data/system/users/0/fpdata/." am: 3f4e982f

am: 05a6820b

Change-Id: I5f46e5a80fe14f5f57c932c236457527092ca9c7
parents 27ef401b 05a6820b
Loading
Loading
Loading
Loading
+2 −2
Original line number Original line Diff line number Diff line
@@ -43,7 +43,7 @@ namespace {
static const uint32_t kTimeout = 3;
static const uint32_t kTimeout = 3;
static const std::chrono::seconds kTimeoutInSeconds = std::chrono::seconds(kTimeout);
static const std::chrono::seconds kTimeoutInSeconds = std::chrono::seconds(kTimeout);
static const uint32_t kGroupId = 99;
static const uint32_t kGroupId = 99;
static const std::string kTmpDir = "/data/system/";
static const std::string kTmpDir = "/data/system/users/0/fpdata/";
static const uint32_t kIterations = 1000;
static const uint32_t kIterations = 1000;


// Wait for a callback to occur (signaled by the given future) up to the
// Wait for a callback to occur (signaled by the given future) up to the
@@ -186,7 +186,7 @@ class FingerprintHidlTest : public ::testing::VtsHalHidlTargetTestBase {
    ASSERT_FALSE(mService == nullptr);
    ASSERT_FALSE(mService == nullptr);


    // Create an active group
    // Create an active group
    // FP service can only write to /data/system due to
    // FP service can only write to /data/system/users/*/fpdata/ due to
    // SELinux Policy and Linux Dir Permissions
    // SELinux Policy and Linux Dir Permissions
    Return<RequestStatus> res = mService->setActiveGroup(kGroupId, kTmpDir);
    Return<RequestStatus> res = mService->setActiveGroup(kGroupId, kTmpDir);
    ASSERT_EQ(RequestStatus::SYS_OK, static_cast<RequestStatus>(res));
    ASSERT_EQ(RequestStatus::SYS_OK, static_cast<RequestStatus>(res));