Snap for 9930594 from 901994d3f2f0756cf237f689be35a629305af80b to udc-release (3aa802e7) · Commits · e / os / platform_frameworks_native

cmds/atrace/atrace.rc

+1 −0

Original line number	Diff line number	Diff line
		@@ -540,6 +540,7 @@ on property:persist.debug.atrace.boottrace=1

		# Run atrace with the categories written in a file
		service boottrace /system/bin/atrace --async_start -f /data/misc/boottrace/categories
		user root
		disabled
		oneshot

cmds/dumpstate/dumpstate.rc

+3 −0

Original line number	Diff line number	Diff line
		@@ -8,6 +8,7 @@ service dumpstate /system/bin/dumpstate -s
		socket dumpstate stream 0660 shell log
		disabled
		oneshot
		user root

		# dumpstatez generates a zipped bugreport but also uses a socket to print the file location once
		# it is finished.
		@@ -16,9 +17,11 @@ service dumpstatez /system/bin/dumpstate -S
		class main
		disabled
		oneshot
		user root

		# bugreportd starts dumpstate binder service and makes it wait for a listener to connect.
		service bugreportd /system/bin/dumpstate -w
		class main
		disabled
		oneshot
		user root

cmds/installd/installd.rc

+1 −0

Original line number	Diff line number	Diff line

		service installd /system/bin/installd
		class main
		user root
		capabilities CHOWN DAC_OVERRIDE DAC_READ_SEARCH FOWNER FSETID KILL SETGID SETUID SYS_ADMIN

		on early-boot

libs/binder/rust/tests/Android.bp

+8 −7

Original line number	Diff line number	Diff line
		@@ -23,6 +23,9 @@ rust_test {
		// this cannot be the same as the module name.
		stem: "rustBinderTestClientBinary",
		test_suites: ["general-tests"],
		data: [
		":rustBinderTestService",
		],
		}

		rust_test {
		@@ -36,10 +39,6 @@ rust_test {
		// this cannot be the same as the module name.
		stem: "rustBinderTestServiceBinary",
		test_harness: false,
		// TODO(b/164473602): Remove this setting and add the module to `data`
		// attribute of rustBinderTest.
		auto_gen_config: false,
		test_suites: ["general-tests"],
		}

		cc_test {
		@@ -100,7 +99,7 @@ cc_test {
		"libbase",
		],
		static_libs: [
		"libbinder_rs_serialization_test"
		"libbinder_rs_serialization_test",
		],
		srcs: [
		"serialization.cpp",
		@@ -116,8 +115,10 @@ rust_bindgen {
		source_stem: "bindings",
		cpp_std: "gnu++17",
		bindgen_flags: [
		"--allowlist-type", "Transaction",
		"--allowlist-var", "TESTDATA_.*",
		"--allowlist-type",
		"Transaction",
		"--allowlist-var",
		"TESTDATA_.*",
		],

		shared_libs: [

libs/jpegrecoverymap/include/jpegrecoverymap/jpegr.h

+26 −2

Original line number	Diff line number	Diff line
		@@ -63,12 +63,26 @@ struct jpegr_info_struct {
		struct jpegr_uncompressed_struct {
		// Pointer to the data location.
		void* data;
		// Width of the recovery map or image in pixels.
		// Width of the recovery map or the luma plane of the image in pixels.
		int width;
		// Height of the recovery map or image in pixels.
		// Height of the recovery map or the luma plane of the image in pixels.
		int height;
		// Color gamut.
		jpegr_color_gamut colorGamut;

		// Values below are optional
		// Pointer to chroma data, if it's NULL, chroma plane is considered to be immediately
		// following after the luma plane.
		// Note: currently this feature is only supported for P010 image (HDR input).
		void* chroma_data = nullptr;
		// Strides of Y plane in number of pixels, using 0 to present uninitialized, must be
		// larger than or equal to luma width.
		// Note: currently this feature is only supported for P010 image (HDR input).
		int luma_stride = 0;
		// Strides of UV plane in number of pixels, using 0 to present uninitialized, must be
		// larger than or equal to chroma width.
		// Note: currently this feature is only supported for P010 image (HDR input).
		int chroma_stride = 0;
		};

		/*
		@@ -363,6 +377,16 @@ private:
		*/
		status_t toneMap(jr_uncompressed_ptr src,
		jr_uncompressed_ptr dest);

		/*
		* This method will check the validity of the input images.
		*
		* @param uncompressed_p010_image uncompressed HDR image in P010 color format
		* @param uncompressed_yuv_420_image uncompressed SDR image in YUV_420 color format
		* @return NO_ERROR if the input images are valid, error code is not valid.
		*/
		status_t areInputImagesValid(jr_uncompressed_ptr uncompressed_p010_image,
		jr_uncompressed_ptr uncompressed_yuv_420_image);
		};

		} // namespace android::jpegrecoverymap