commit 1cba46d4b5dbec9fe131fb4102601416317317db
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Tue May 21 09:31:27 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue May 21 09:31:27 2024 +0000
tree b58ff51c69ae63916fc4ebc7d594fcdf2cadf36a
parent 578d4563a549c26ab0c1cbbbe4c0bf2d4780f6f5
parent b2a0287342deeea2744678008c5a5e5aba1079ac

Merge "binder::get_interface -> binder::wait_for_interface" into main

virtualizationmanager/src/aidl.rs

diff --git a/virtualizationmanager/src/aidl.rs b/virtualizationmanager/src/aidl.rs
index 796ae21..aeee6f7 100644
--- a/virtualizationmanager/src/aidl.rs
+++ b/virtualizationmanager/src/aidl.rs
@@ -1049,7 +1049,7 @@
         return Ok(());
     }
     let perm_svc: Strong<dyn IPermissionController::IPermissionController> =
-        binder::get_interface("permission")?;
+        binder::wait_for_interface("permission")?;
     if perm_svc.checkPermission(perm, calling_pid, calling_uid as i32)? {
         Ok(())
     } else {

virtualizationservice/src/aidl.rs

diff --git a/virtualizationservice/src/aidl.rs b/virtualizationservice/src/aidl.rs
index 5dbfe22..5e71245 100644
--- a/virtualizationservice/src/aidl.rs
+++ b/virtualizationservice/src/aidl.rs
@@ -875,7 +875,7 @@
         return Ok(());
     }
     let perm_svc: Strong<dyn IPermissionController::IPermissionController> =
-        binder::get_interface("permission")?;
+        binder::wait_for_interface("permission")?;
     if perm_svc.checkPermission(perm, calling_pid, calling_uid as i32)? {
         Ok(())
     } else {