Merge "hidl_test: don't expect token manager on new devices" into main am: 47ac721904 am: b43565659a

Original change: https://android-review.googlesource.com/c/platform/system/tools/hidl/+/2609120

Change-Id: I87acb89ea870c2715b94547bc7c32f02ae88d0eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

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);