| commit | 00480fcf706dff4595cc9768ecf514499ad2b467 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Tue May 21 10:12:26 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue May 21 10:12:26 2024 +0000 |
| tree | 5107fcdf9a5658bae78b96d4c2f7e3a2ffcde6a2 | |
| parent | c061cb54fbc1bc95a0285b13397e64cdb427b033 [diff] | |
| parent | f845ccb7cdfa9df5ab2ac9e72e4a24055dc646a5 [diff] |
Merge "binder::get_interface -> binder::wait_for_interface" into main am: 1cba46d4b5 am: f845ccb7cd Original change: https://android-review.googlesource.com/c/platform/packages/modules/Virtualization/+/3079665 Change-Id: Ic6d87f36c47943a0714b0cc1640d2ee757cce891 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
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 {
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 {