[API][Refactoring] Move service name to IVmPayloadService
Bug: 243512047
Test: MicrodroidTests
Change-Id: Ie8c0d1fb7d91bd3e9cd6f79540d4f130f3e54a80
diff --git a/microdroid/vm_payload/src/vm_service.rs b/microdroid/vm_payload/src/vm_service.rs
index a8f980a..7414827 100644
--- a/microdroid/vm_payload/src/vm_service.rs
+++ b/microdroid/vm_payload/src/vm_service.rs
@@ -14,14 +14,12 @@
//! This module handles the interaction with virtual machine payload service.
-use android_system_virtualization_payload::aidl::android::system::virtualization::payload::IVmPayloadService::IVmPayloadService;
+use android_system_virtualization_payload::aidl::android::system::virtualization::payload::IVmPayloadService::{
+ IVmPayloadService, VM_PAYLOAD_SERVICE_NAME};
use anyhow::{Context, Result};
use binder::{wait_for_interface, Strong};
use log::{error, info, Level};
-/// The CID representing the host VM
-const VM_PAYLOAD_SERVICE_NAME: &str = "virtual_machine_payload_service";
-
/// Notifies the host that the payload is ready.
/// Returns true if the notification succeeds else false.
#[no_mangle]
diff --git a/microdroid_manager/aidl/android/system/virtualization/payload/IVmPayloadService.aidl b/microdroid_manager/aidl/android/system/virtualization/payload/IVmPayloadService.aidl
index 4ae686b..82cbf43 100644
--- a/microdroid_manager/aidl/android/system/virtualization/payload/IVmPayloadService.aidl
+++ b/microdroid_manager/aidl/android/system/virtualization/payload/IVmPayloadService.aidl
@@ -21,6 +21,9 @@
* Microdroid Manager for execution.
*/
interface IVmPayloadService {
+ /** Name of the service IVmPayloadService. */
+ const String VM_PAYLOAD_SERVICE_NAME = "virtual_machine_payload_service";
+
/** Notifies that the payload is ready to serve. */
void notifyPayloadReady();
}
diff --git a/microdroid_manager/src/vm_payload_service.rs b/microdroid_manager/src/vm_payload_service.rs
index 6eb3240..0050a4c 100644
--- a/microdroid_manager/src/vm_payload_service.rs
+++ b/microdroid_manager/src/vm_payload_service.rs
@@ -14,13 +14,12 @@
//! Implementation of the AIDL interface `IVmPayloadService`.
-use android_system_virtualization_payload::aidl::android::system::virtualization::payload::IVmPayloadService::{BnVmPayloadService, IVmPayloadService};
+use android_system_virtualization_payload::aidl::android::system::virtualization::payload::IVmPayloadService::{
+ BnVmPayloadService, IVmPayloadService, VM_PAYLOAD_SERVICE_NAME};
use android_system_virtualmachineservice::aidl::android::system::virtualmachineservice::IVirtualMachineService::IVirtualMachineService;
use anyhow::{Context, Result};
use binder::{Interface, BinderFeatures, Strong, add_service};
-const VM_PAYLOAD_SERVICE_NAME: &str = "virtual_machine_payload_service";
-
/// Implementation of `IVmPayloadService`.
struct VmPayloadService {
virtual_machine_service: Strong<dyn IVirtualMachineService>,