Snap for 13697098 from 9d3405cce8e9ecd835ac461fab1e14f5a28eea34 to 25Q4-release (4c5c63df) · Commits · e / os / android_frameworks_native

cmds/sfdo/OWNERS

0 → 100644

+3 −0

Original line number	Diff line number	Diff line
		# Bug component: 1075130

		include /services/surfaceflinger/OWNERS
		No newline at end of file

+14 −2

Original line number	Diff line number	Diff line
		@@ -460,7 +460,13 @@ binder_status_t AParcel_readStringArray(const AParcel* parcel, void* arrayData,
		return status;
		}

		if (!allocator(arrayData, length)) return STATUS_NO_MEMORY;
		if (!allocator(arrayData, length)) {
		if (length < 0) {
		return STATUS_UNEXPECTED_NULL;
		} else {
		return STATUS_NO_MEMORY;
		}
		}

		if (length == -1) return STATUS_OK; // null string array

		@@ -504,7 +510,13 @@ binder_status_t AParcel_readParcelableArray(const AParcel* parcel, void* arrayDa
		return status;
		}

		if (!allocator(arrayData, length)) return STATUS_NO_MEMORY;
		if (!allocator(arrayData, length)) {
		if (length < 0) {
		return STATUS_UNEXPECTED_NULL;
		} else {
		return STATUS_NO_MEMORY;
		}
		}

		if (length == -1) return STATUS_OK; // null array

+0 −14

Original line number	Diff line number	Diff line
		@@ -323,20 +323,6 @@ TEST(BinderAccessorAllocation, AddAccessorCheckService) {
		status_t status = android::removeAccessorProvider(receipt);
		}

		TEST(BinderAccessorAllocation, AddAccessorEmpty) {
		std::vector<size_t> expectedMallocs = {
		48, // From ALOGE with empty set of instances
		};
		std::set<std::string> supportedInstances = {};
		auto onMalloc = setExpectedMallocs(std::move(expectedMallocs));

		auto receipt =
		android::addAccessorProvider(std::move(supportedInstances),
		[&](const String16&) -> sp<IBinder> { return nullptr; });

		EXPECT_TRUE(receipt.expired());
		}

		TEST(RpcBinderAllocation, SetupRpcServer) {
		std::string tmp = getenv("TMPDIR") ?: "/tmp";
		std::string addr = tmp + "/binderRpcBenchmark";

+1 −0

Original line number	Diff line number	Diff line
		@@ -49,6 +49,7 @@ cc_aconfig_library {
		host_supported: true,
		apex_available: [
		"//apex_available:platform",
		"com.android.media",
		"com.android.media.swcodec",
		],
		aconfig_declarations: "libgui_flags",

+19 −0

Original line number	Diff line number	Diff line
		@@ -43,6 +43,18 @@ parcelable DeviceProductInfo {
		ManufactureWeekAndYear manufactureWeekAndYear;
		}

		parcelable EdidStructureMetadata {
		// The EDID structure version number and revision number fields (required).
		int version;
		int revision;
		}

		@Backing(type="byte")
		enum InputType {
		ANALOG,
		DIGITAL
		}

		// Display name.
		@utf8InCpp String name;

		@@ -54,5 +66,12 @@ parcelable DeviceProductInfo {

		ManufactureOrModelDate manufactureOrModelDate;

		// General EDID structure metadata.
		EdidStructureMetadata edidStructureMetadata;

		// The input type of the device (analog or digital; required).
		InputType inputType;

		// Relative address in the display network.
		byte[] relativeAddress;
		}