Merge "[binder] Move Rust ping_binder() to external API" (13a5e9c0) · Commits · e / os / android_frameworks_native

libs/binder/rust/src/binder.rs

+3 −3

Original line number	Diff line number	Diff line
		@@ -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.

+11 −11

Original line number	Diff line number	Diff line
		@@ -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 {