commit eb5bd05408f46b6a14b4393108de8b92cf4bba2d
author Andrew Scull <ascull@google.com> Tue Jul 13 00:56:03 2021 +0000
committer Andrew Scull <ascull@google.com> Tue Jul 13 00:56:03 2021 +0000
tree e833edca0e34d94919548450d63b8f5c4eb3f77a
parent 70bbb1fae30248f9e73bf583c1a9fac26486b949

Wait for keystore from the test binary

Test: atest MicrodroidHostTestCases
Bug: 193389556
Change-Id: I48582cb0b78563230c4d5c67782b0e5c92d94d2d

tests/testapk/src/native/testbinary.cpp

diff --git a/tests/testapk/src/native/testbinary.cpp b/tests/testapk/src/native/testbinary.cpp
index ed9503a..1572021 100644
--- a/tests/testapk/src/native/testbinary.cpp
+++ b/tests/testapk/src/native/testbinary.cpp
@@ -45,7 +45,7 @@
 Result<void> test_keystore() {
     // Connect to Keystore.
     ndk::SpAIBinder binder(
-            AServiceManager_getService("android.system.keystore2.IKeystoreService/default"));
+            AServiceManager_waitForService("android.system.keystore2.IKeystoreService/default"));
     auto service = IKeystoreService::fromBinder(binder);
     if (service == nullptr) {
         return Error() << "Failed to find Keystore";