Snap for 12868993 from 5d7cd395540fb63d48c500e3dca6b31952f25797 to 25Q2-release (6820b756) · Commits · e / os / android_frameworks_native

data/etc/Android.bp

+6 −0

Original line number	Original line	Diff line number	Diff line
	@@ -304,6 +304,12 @@ prebuilt_etc {
	defaults: ["frameworks_native_data_etc_defaults"],		defaults: ["frameworks_native_data_etc_defaults"],
	}		}

			prebuilt_etc {
			name: "android.hardware.telephony.satellite.prebuilt.xml",
			src: "android.hardware.telephony.satellite.xml",
			defaults: ["frameworks_native_data_etc_defaults"],
			}

	prebuilt_etc {		prebuilt_etc {
	name: "android.hardware.telephony.ims.singlereg.prebuilt.xml",		name: "android.hardware.telephony.ims.singlereg.prebuilt.xml",
	src: "android.hardware.telephony.ims.singlereg.xml",		src: "android.hardware.telephony.ims.singlereg.xml",

libs/binder/include/binder/Parcel.h

+1 −2

libs/binder/ndk/tests/binderVendorDoubleLoadTest.cpp

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -30,6 +30,8 @@
	#include <gtest/gtest.h>		#include <gtest/gtest.h>
	#include <sys/prctl.h>		#include <sys/prctl.h>

			static_assert(FLAG_PRIVATE_LOCAL != 0, "Build system configuration breaks stability");

	using namespace android;		using namespace android;
	using ::android::binder::Status;		using ::android::binder::Status;
	using ::android::internal::Stability;		using ::android::internal::Stability;

libs/binder/rust/src/system_only.rs

+2 −7

Original line number	Original line	Diff line number	Diff line
	@@ -24,21 +24,16 @@ use std::os::raw::c_char;

	use libc::{sockaddr, sockaddr_un, sockaddr_vm, socklen_t};		use libc::{sockaddr, sockaddr_un, sockaddr_vm, socklen_t};
	use std::sync::Arc;		use std::sync::Arc;
	use std::{fmt, mem, ptr};		use std::{mem, ptr};

	/// Rust wrapper around ABinderRpc_Accessor objects for RPC binder service management.		/// Rust wrapper around ABinderRpc_Accessor objects for RPC binder service management.
	///		///
	/// Dropping the `Accessor` will drop the underlying object and the binder it owns.		/// Dropping the `Accessor` will drop the underlying object and the binder it owns.
			#[derive(Debug)]
	pub struct Accessor {		pub struct Accessor {
	accessor: *mut sys::ABinderRpc_Accessor,		accessor: *mut sys::ABinderRpc_Accessor,
	}		}

	impl fmt::Debug for Accessor {
	fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
	write!(f, "ABinderRpc_Accessor({:p})", self.accessor)
	}
	}

	/// Socket connection info required for libbinder to connect to a service.		/// Socket connection info required for libbinder to connect to a service.
	#[derive(Debug, Clone, Copy, PartialEq, Eq)]		#[derive(Debug, Clone, Copy, PartialEq, Eq)]
	pub enum ConnectionInfo {		pub enum ConnectionInfo {

libs/binder/tests/binderSafeInterfaceTest.cpp

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -789,7 +789,7 @@ TEST_F(SafeInterfaceTest, TestCallMeBack) {
	std::optional<int32_t> waitForCallback() {		std::optional<int32_t> waitForCallback() {
	std::unique_lock<decltype(mMutex)> lock(mMutex);		std::unique_lock<decltype(mMutex)> lock(mMutex);
	bool success =		bool success =
	mCondition.wait_for(lock, 100ms, [&]() { return static_cast<bool>(mValue); });		mCondition.wait_for(lock, 1000ms, [&]() { return static_cast<bool>(mValue); });
	return success ? mValue : std::nullopt;		return success ? mValue : std::nullopt;
	}		}

Original line number	Original line	Diff line number	Diff line
	@@ -401,8 +401,6 @@ public:
	// as long as it keeps a dup of the blob file descriptor handy for later.		// as long as it keeps a dup of the blob file descriptor handy for later.
	LIBBINDER_EXPORTED status_t writeDupImmutableBlobFileDescriptor(int fd);		LIBBINDER_EXPORTED status_t writeDupImmutableBlobFileDescriptor(int fd);

	LIBBINDER_EXPORTED status_t writeObject(const flat_binder_object& val, bool nullMetaData);

	// Like Parcel.java's writeNoException(). Just writes a zero int32.		// Like Parcel.java's writeNoException(). Just writes a zero int32.
	// Currently the native implementation doesn't do any of the StrictMode		// Currently the native implementation doesn't do any of the StrictMode
	// stack gathering and serialization that the Java implementation does.		// stack gathering and serialization that the Java implementation does.
	@@ -685,6 +683,7 @@ private:
	// Set the capacity to `desired`, truncating the Parcel if necessary.		// Set the capacity to `desired`, truncating the Parcel if necessary.
	status_t continueWrite(size_t desired);		status_t continueWrite(size_t desired);
	status_t truncateRpcObjects(size_t newObjectsSize);		status_t truncateRpcObjects(size_t newObjectsSize);
			status_t writeObject(const flat_binder_object& val, bool nullMetaData);
	status_t writePointer(uintptr_t val);		status_t writePointer(uintptr_t val);
	status_t readPointer(uintptr_t *pArg) const;		status_t readPointer(uintptr_t *pArg) const;
	uintptr_t readPointer() const;		uintptr_t readPointer() const;