Wait for keystore from CompOs
There is no explicit synchronization to ensure keystore will be
available when the payload runs so wait for it in case it happened to
take longer than expected.
Test: Run compos_key_host, connect to it via compos_key_cmd
Bug: 193389556
Change-Id: I06cdde4c95864bc0720310885e8e1e83b19777ea
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 {