Make error names more consistent.
We shouldn't have 3 spellings for the same error.
(We still expose STOP_REASON_MICRODROID_INVALID_PAYLOAD_CONFIG and
ERROR_PAYLOAD_INVALID_CONFIG in the API, so they're hard to change,
but we'll just have to live with that.)
Test: atest MicrodroidTests
Change-Id: I867833685ef951e67dc39de3d079271d7fe4bf11
diff --git a/javalib/src/android/system/virtualmachine/VirtualMachine.java b/javalib/src/android/system/virtualmachine/VirtualMachine.java
index 675a046..16f9631 100644
--- a/javalib/src/android/system/virtualmachine/VirtualMachine.java
+++ b/javalib/src/android/system/virtualmachine/VirtualMachine.java
@@ -1382,7 +1382,7 @@
return ERROR_PAYLOAD_VERIFICATION_FAILED;
case ErrorCode.PAYLOAD_CHANGED:
return ERROR_PAYLOAD_CHANGED;
- case ErrorCode.PAYLOAD_CONFIG_INVALID:
+ case ErrorCode.PAYLOAD_INVALID_CONFIG:
return ERROR_PAYLOAD_INVALID_CONFIG;
default:
return ERROR_UNKNOWN;
diff --git a/microdroid_manager/src/main.rs b/microdroid_manager/src/main.rs
index 8175753..7ba54f8 100644
--- a/microdroid_manager/src/main.rs
+++ b/microdroid_manager/src/main.rs
@@ -92,7 +92,7 @@
#[error("Payload verification has failed: {0}")]
PayloadVerificationFailed(String),
#[error("Payload config is invalid: {0}")]
- InvalidConfig(String),
+ PayloadInvalidConfig(String),
}
fn translate_error(err: &Error) -> (ErrorCode, String) {
@@ -102,8 +102,8 @@
MicrodroidError::PayloadVerificationFailed(msg) => {
(ErrorCode::PAYLOAD_VERIFICATION_FAILED, msg.to_string())
}
- MicrodroidError::InvalidConfig(msg) => {
- (ErrorCode::PAYLOAD_CONFIG_INVALID, msg.to_string())
+ MicrodroidError::PayloadInvalidConfig(msg) => {
+ (ErrorCode::PAYLOAD_INVALID_CONFIG, msg.to_string())
}
// Connection failure won't be reported to VS; return the default value
@@ -126,7 +126,7 @@
MicrodroidError::PayloadVerificationFailed(_) => {
"MICRODROID_PAYLOAD_VERIFICATION_FAILED"
}
- MicrodroidError::InvalidConfig(_) => "MICRODROID_INVALID_PAYLOAD_CONFIG",
+ MicrodroidError::PayloadInvalidConfig(_) => "MICRODROID_INVALID_PAYLOAD_CONFIG",
})
} else {
// Send context information back after a separator, to ease diagnosis.
@@ -326,12 +326,14 @@
if is_new_instance() {
ensure!(
saved_data.is_none(),
- MicrodroidError::InvalidConfig("Found instance data on first boot.".to_string())
+ MicrodroidError::PayloadInvalidConfig(
+ "Found instance data on first boot.".to_string()
+ )
);
} else {
ensure!(
saved_data.is_some(),
- MicrodroidError::InvalidConfig("Instance data not found.".to_string())
+ MicrodroidError::PayloadInvalidConfig("Instance data not found.".to_string())
);
};
}
@@ -367,7 +369,7 @@
};
let payload_metadata = metadata.payload.ok_or_else(|| {
- MicrodroidError::InvalidConfig("No payload config in metadata".to_string())
+ MicrodroidError::PayloadInvalidConfig("No payload config in metadata".to_string())
})?;
// To minimize the exposure to untrusted data, derive dice profile as soon as possible.
@@ -407,7 +409,7 @@
let task = config
.task
.as_ref()
- .ok_or_else(|| MicrodroidError::InvalidConfig("No task in VM config".to_string()))?;
+ .ok_or_else(|| MicrodroidError::PayloadInvalidConfig("No task in VM config".to_string()))?;
ensure!(
config.extra_apks.len() == verified_data.extra_apks_data.len(),
diff --git a/virtualizationservice/aidl/android/system/virtualizationcommon/ErrorCode.aidl b/virtualizationservice/aidl/android/system/virtualizationcommon/ErrorCode.aidl
index 04b9749..cf1e251 100644
--- a/virtualizationservice/aidl/android/system/virtualizationcommon/ErrorCode.aidl
+++ b/virtualizationservice/aidl/android/system/virtualizationcommon/ErrorCode.aidl
@@ -39,5 +39,5 @@
/**
* Error code indicating that the payload config is invalid.
*/
- PAYLOAD_CONFIG_INVALID = 3,
+ PAYLOAD_INVALID_CONFIG = 3,
}
diff --git a/vmclient/src/error_code.rs b/vmclient/src/error_code.rs
index 10e6d4d..59b25a0 100644
--- a/vmclient/src/error_code.rs
+++ b/vmclient/src/error_code.rs
@@ -28,7 +28,7 @@
PayloadChanged,
/// Error code indicating that the payload config is invalid.
- PayloadConfigInvalid,
+ PayloadInvalidConfig,
/// Payload sent a death reason which was not recognised by the client library.
Unrecognised(AidlErrorCode),
@@ -40,7 +40,7 @@
AidlErrorCode::UNKNOWN => Self::Unknown,
AidlErrorCode::PAYLOAD_VERIFICATION_FAILED => Self::PayloadVerificationFailed,
AidlErrorCode::PAYLOAD_CHANGED => Self::PayloadChanged,
- AidlErrorCode::PAYLOAD_CONFIG_INVALID => Self::PayloadConfigInvalid,
+ AidlErrorCode::PAYLOAD_INVALID_CONFIG => Self::PayloadInvalidConfig,
_ => Self::Unrecognised(error_code),
}
}