commit fc25f0776a4cb2a15ea8f098236c4b8494727316
author Treehugger Robot <treehugger-gerrit@google.com> Thu Jul 15 13:15:31 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jul 15 13:15:31 2021 +0000
tree 12dfcbd47873cc045be7106f87bdfeb2d9afc306
parent 94e492c5571d463c288daf05793dd8975c855241
parent ffdf7ada9c81c7a2bb94d2d1157876d42e42a770

Merge "Wait for keystore from CompOs"

compos/src/compos_key_service.rs

diff --git a/compos/src/compos_key_service.rs b/compos/src/compos_key_service.rs
index 6b62e0f..654eedd 100644
--- a/compos/src/compos_key_service.rs
+++ b/compos/src/compos_key_service.rs
@@ -30,7 +30,7 @@
     CompOsKeyData::CompOsKeyData, ICompOsKeyService::ICompOsKeyService,
 };
 use compos_aidl_interface::binder::{
-    self, get_interface, ExceptionCode, Interface, Status, Strong,
+    self, wait_for_interface, ExceptionCode, Interface, Status, Strong,
 };
 use log::warn;
 use ring::rand::{SecureRandom, SystemRandom};
@@ -95,7 +95,7 @@
 
 impl CompOsKeyService {
     pub fn new() -> Result<Self> {
-        let keystore_service = get_interface::<dyn IKeystoreService>(KEYSTORE_SERVICE_NAME)
+        let keystore_service = wait_for_interface::<dyn IKeystoreService>(KEYSTORE_SERVICE_NAME)
             .context("No Keystore service")?;
 
         Ok(Self {