commit 14faaa4665d29a2e091eb7e27dcfaf75cd7a7ea7
author Tri Vo <trong@google.com> Tue Jul 18 19:56:09 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jul 18 19:56:09 2023 +0000
tree f7afcb5893ff36cd4d59d9ccf9e015eb9d02b383
parent b0a6a2adc19b94084fabf2d1f78f64ada86f9cb9
parent 8d08cd9c5e146ab0fc868385e68a4c6547e5b996

Merge "Keystore: Use waitForService() instead of getService()" into main

keystore/keystore_attestation_id.cpp

diff --git a/keystore/keystore_attestation_id.cpp b/keystore/keystore_attestation_id.cpp
index ccd3808..75c62dd 100644
--- a/keystore/keystore_attestation_id.cpp
+++ b/keystore/keystore_attestation_id.cpp
@@ -74,8 +74,8 @@
 }
 
 KeyAttestationApplicationIdProvider::KeyAttestationApplicationIdProvider()
-    : BpKeyAttestationApplicationIdProvider(
-          android::defaultServiceManager()->getService(String16("sec_key_att_app_id_provider"))) {}
+    : BpKeyAttestationApplicationIdProvider(android::defaultServiceManager()->waitForService(
+          String16("sec_key_att_app_id_provider"))) {}
 
 DECLARE_STACK_OF(ASN1_OCTET_STRING);