Use new binder exception constructors moved from binder_common.
Bug: 234019127
Test: atest compos_key_tests MicrodroidHostTestCases MicrodroidTestApp
Change-Id: I938c9d0ebae90c933c9a7ee8c27e9ecb0cc3e5fa
diff --git a/authfs/fd_server/src/aidl.rs b/authfs/fd_server/src/aidl.rs
index 3a3cdb2..0e8952e 100644
--- a/authfs/fd_server/src/aidl.rs
+++ b/authfs/fd_server/src/aidl.rs
@@ -42,7 +42,6 @@
use authfs_fsverity_metadata::{
get_fsverity_metadata_path, parse_fsverity_metadata, FSVerityMetadata,
};
-use binder_common::{new_binder_exception, new_binder_service_specific_error};
/// Bitflags of forbidden file mode, e.g. setuid, setgid and sticky bit.
const FORBIDDEN_MODES: Mode = Mode::from_bits_truncate(!0o777);
@@ -107,9 +106,12 @@
entry.insert(new_fd_config);
Ok(new_fd)
} else {
- Err(new_binder_exception(
+ Err(Status::new_exception_str(
ExceptionCode::ILLEGAL_STATE,
- format!("The newly created FD {} is already in the pool unexpectedly", new_fd),
+ Some(format!(
+ "The newly created FD {} is already in the pool unexpectedly",
+ new_fd
+ )),
))
}
}
@@ -173,9 +175,9 @@
if let Some(signature) = &metadata.signature {
Ok(signature.clone())
} else {
- Err(new_binder_exception(
- ExceptionCode::SERVICE_SPECIFIC,
- "metadata doesn't contain a signature",
+ Err(Status::new_service_specific_error_str(
+ -1,
+ Some("metadata doesn't contain a signature"),
))
}
} else {
@@ -395,7 +397,7 @@
}
fn new_errno_error(errno: Errno) -> Status {
- new_binder_service_specific_error(errno as i32, errno.desc())
+ Status::new_service_specific_error_str(errno as i32, Some(errno.desc()))
}
fn open_readonly_at(dir_fd: RawFd, path: &Path) -> nix::Result<File> {