commit 9d6a3dcca9e2f848cf1cd97b3d8df63dd9e80a36
author Eric Biggers <ebiggers@google.com> Fri Oct 18 16:48:38 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Oct 18 16:48:38 2024 +0000
tree 3b3cde1988f0025510cbb4567d50782271f9ec44
parent 1e029dce710c7a1444dee12a14656da36921cbce
parent bc75f869fbd19add421c3c8da40dd88af673ce4c

Merge "Stop using deprecated function AServiceManager_getService()" into main

Keystore.cpp

diff --git a/Keystore.cpp b/Keystore.cpp
index adadde0..fd8a887 100644
--- a/Keystore.cpp
+++ b/Keystore.cpp
@@ -224,7 +224,7 @@
 }
 
 void Keystore::earlyBootEnded() {
-    ::ndk::SpAIBinder binder(AServiceManager_getService(maintenance_service_name));
+    ::ndk::SpAIBinder binder(AServiceManager_waitForService(maintenance_service_name));
     auto maint_service = ks2_maint::IKeystoreMaintenance::fromBinder(binder);
 
     if (!maint_service) {
@@ -237,7 +237,7 @@
 }
 
 void Keystore::deleteAllKeys() {
-    ::ndk::SpAIBinder binder(AServiceManager_getService(maintenance_service_name));
+    ::ndk::SpAIBinder binder(AServiceManager_waitForService(maintenance_service_name));
     auto maint_service = ks2_maint::IKeystoreMaintenance::fromBinder(binder);
 
     if (!maint_service) {