commit 937084f5905f71adfdc570150f481e5feaab28bd
author Andrew Walbran <qwandor@google.com> Mon Jul 24 10:41:53 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Jul 24 10:41:53 2023 +0000
tree f1bf9d8e56bdfbb5adb1332ac6e81a4e327123bf
parent fa6e5a734c2f206dfa91bce174236416120066ba
parent c768733f763025280aebe167b0726fb3396827a6

Merge "Add safety comments to prng_seeder." into main

OWNERS

diff --git a/OWNERS b/OWNERS
index 03e5769..6fdb550 100644
--- a/OWNERS
+++ b/OWNERS
@@ -1,5 +1,4 @@
 alanstokes@google.com
-cbrubaker@google.com
 drysdale@google.com
 eranm@google.com
 hasinitg@google.com
@@ -8,4 +7,5 @@
 kroot@google.com
 sethmo@google.com
 swillden@google.com
+trong@google.com
 zeuthen@google.com

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