diff options
author | Devin Moore <devinmoore@google.com> | 2023-05-31 18:07:06 +0000 |
---|---|---|
committer | Devin Moore <devinmoore@google.com> | 2024-01-05 16:30:49 +0000 |
commit | 3d161cd2bf11f833a544d68010f420e03bb2a242 (patch) | |
tree | 65a77c71219021fb17817c6e3455244f54a8f8f5 | |
parent | 391b78c01d7c143eff82449d3b9c627e6bcf8f4b (diff) | |
download | hidl-3d161cd2bf11f833a544d68010f420e03bb2a242.tar.gz |
hidl_test: don't expect token manager on new devices
Test: atest hidl_test
Bug: 218588089
Change-Id: Id6907df1aa86deaf4f7de068c41d22ceaf15bb27
-rw-r--r-- | test/hidl_test/hidl_test_client.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/test/hidl_test/hidl_test_client.cpp b/test/hidl_test/hidl_test_client.cpp index d82dab60..55490d28 100644 --- a/test/hidl_test/hidl_test_client.cpp +++ b/test/hidl_test/hidl_test_client.cpp @@ -361,16 +361,17 @@ public: void getServices() { manager = IServiceManager::getService(); - // alternatively: // manager = defaultServiceManager() ASSERT_NE(manager, nullptr); ASSERT_TRUE(manager->isRemote()); // manager is always remote + // Token manager only exists on devices before Android V tokenManager = ITokenManager::getService(); - ASSERT_NE(tokenManager, nullptr); - ASSERT_TRUE(tokenManager->isRemote()); // tokenManager is always remote + if (tokenManager) { + ASSERT_TRUE(tokenManager->isRemote()); // tokenManager is always remote + } ashmemAllocator = IAllocator::getService("ashmem"); ASSERT_NE(ashmemAllocator, nullptr); @@ -871,6 +872,9 @@ TEST_F(HidlTest, InterfacesEqualTest) { TEST_F(HidlTest, TestToken) { using android::hardware::interfacesEqual; + if (!tokenManager) { + GTEST_SKIP() << "Token manager is not available devices newer than Android U"; + } Return<void> ret = tokenManager->createToken(manager, [&] (const hidl_vec<uint8_t> &token) { Return<sp<IBase>> retService = tokenManager->get(token); EXPECT_OK(retService); |