diff options
author | Steven Moreland <smoreland@google.com> | 2022-01-24 21:19:29 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2022-01-24 21:19:29 +0000 |
commit | 13a5e9c010acceb08252c75e66596e99b5968950 (patch) | |
tree | 56798dd89d18bf65988682603c961c48d3efe211 | |
parent | bdca6b79d08d5d8487a35ae52900518514fc1e22 (diff) | |
parent | 61366d4bd1a6f797a1274fc989fd12b525097913 (diff) | |
download | native-13a5e9c010acceb08252c75e66596e99b5968950.tar.gz |
Merge "[binder] Move Rust ping_binder() to external API"
-rw-r--r-- | libs/binder/rust/src/binder.rs | 6 | ||||
-rw-r--r-- | libs/binder/rust/src/proxy.rs | 22 |
2 files changed, 14 insertions, 14 deletions
diff --git a/libs/binder/rust/src/binder.rs b/libs/binder/rust/src/binder.rs index 7895a7293d..467e51e276 100644 --- a/libs/binder/rust/src/binder.rs +++ b/libs/binder/rust/src/binder.rs @@ -192,9 +192,6 @@ pub trait IBinderInternal: IBinder { /// Is this object still alive? fn is_binder_alive(&self) -> bool; - /// Send a ping transaction to this object - fn ping_binder(&mut self) -> Result<()>; - /// Indicate that the service intends to receive caller security contexts. #[cfg(not(android_vndk))] fn set_requesting_sid(&mut self, enable: bool); @@ -270,6 +267,9 @@ pub trait IBinder { /// The recipient will no longer be called if this object /// dies. fn unlink_to_death(&mut self, recipient: &mut DeathRecipient) -> Result<()>; + + /// Send a ping transaction to this object + fn ping_binder(&mut self) -> Result<()>; } /// Opaque reference to the type of a Binder interface. diff --git a/libs/binder/rust/src/proxy.rs b/libs/binder/rust/src/proxy.rs index 760d862c53..12bfde755e 100644 --- a/libs/binder/rust/src/proxy.rs +++ b/libs/binder/rust/src/proxy.rs @@ -312,17 +312,6 @@ impl<T: AsNative<sys::AIBinder>> IBinderInternal for T { } } - fn ping_binder(&mut self) -> Result<()> { - let status = unsafe { - // Safety: `SpIBinder` guarantees that `self` always contains a - // valid pointer to an `AIBinder`. - // - // This call does not affect ownership of its pointer parameter. - sys::AIBinder_ping(self.as_native_mut()) - }; - status_result(status) - } - #[cfg(not(android_vndk))] fn set_requesting_sid(&mut self, enable: bool) { unsafe { sys::AIBinder_setRequestingSid(self.as_native_mut(), enable) }; @@ -412,6 +401,17 @@ impl<T: AsNative<sys::AIBinder>> IBinder for T { ) }) } + + fn ping_binder(&mut self) -> Result<()> { + let status = unsafe { + // Safety: `SpIBinder` guarantees that `self` always contains a + // valid pointer to an `AIBinder`. + // + // This call does not affect ownership of its pointer parameter. + sys::AIBinder_ping(self.as_native_mut()) + }; + status_result(status) + } } impl Serialize for SpIBinder { |