diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-12-19 13:46:41 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-12-19 13:46:41 +0000 |
commit | f468b7400293e860fc8f0d78109cfd36ed72d355 (patch) | |
tree | 5669db5a222f8bf7f17d350377b375e8bdb57b9a /security/keymint/aidl/vts/functional/VerificationTokenTest.cpp | |
parent | 3413e6acd4df9c3c406be82a0df8b8a7086d7450 (diff) | |
parent | c670b8d592bb1e750dac44566abd61b9a44e01e9 (diff) |
Merge "Keymint: Use ndk_platform." am: dfe843477b am: 24f8ba41c4 am: c670b8d592
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1532211
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I6195d05d61cc03dc409e67b74b322367488dd894
Diffstat (limited to 'security/keymint/aidl/vts/functional/VerificationTokenTest.cpp')
-rw-r--r-- | security/keymint/aidl/vts/functional/VerificationTokenTest.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/security/keymint/aidl/vts/functional/VerificationTokenTest.cpp b/security/keymint/aidl/vts/functional/VerificationTokenTest.cpp index 6d3a34e7a6..0b1eccddfd 100644 --- a/security/keymint/aidl/vts/functional/VerificationTokenTest.cpp +++ b/security/keymint/aidl/vts/functional/VerificationTokenTest.cpp @@ -16,7 +16,7 @@ #include "KeyMintAidlTestBase.h" -namespace android::hardware::security::keymint::test { +namespace aidl::android::hardware::security::keymint::test { class VerificationTokenTest : public KeyMintAidlTestBase { protected: @@ -165,4 +165,4 @@ TEST_P(VerificationTokenTest, MacChangesOnChangingTimestamp) { INSTANTIATE_KEYMINT_AIDL_TEST(VerificationTokenTest); -} // namespace android::hardware::security::keymint::test +} // namespace aidl::android::hardware::security::keymint::test |