From eb5bd05408f46b6a14b4393108de8b92cf4bba2d Mon Sep 17 00:00:00 2001
From: Andrew Scull <ascull@google.com>
Date: Tue, 13 Jul 2021 00:56:03 +0000
Subject: [PATCH] Wait for keystore from the test binary

Test: atest MicrodroidHostTestCases
Bug: 193389556
Change-Id: I48582cb0b78563230c4d5c67782b0e5c92d94d2d
---
 tests/testapk/src/native/testbinary.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/testapk/src/native/testbinary.cpp b/tests/testapk/src/native/testbinary.cpp
index ed9503a4..15720213 100644
--- a/tests/testapk/src/native/testbinary.cpp
+++ b/tests/testapk/src/native/testbinary.cpp
@@ -45,7 +45,7 @@ namespace {
 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";