Snap for 8414339 from 7e7ccad2a0053f6a54ed5b69165339f5ee919653 to tm-qpr1-release (5c484761) · Commits · e / os / android_frameworks_native

TEST_MAPPING

+61 −0

Original line number	Diff line number	Diff line
		@@ -67,5 +67,66 @@
		}
		]
		}
		],
		"hwasan-postsubmit": [
		{
		"name": "SurfaceFlinger_test",
		"options": [
		{
		"include-filter": "CredentialsTest."
		},
		{
		"include-filter": "SurfaceFlingerStress."
		},
		{
		"include-filter": "SurfaceInterceptorTest."
		},
		{
		"include-filter": "LayerTransactionTest."
		},
		{
		"include-filter": "LayerTypeTransactionTest."
		},
		{
		"include-filter": "LayerUpdateTest."
		},
		{
		"include-filter": "GeometryLatchingTest."
		},
		{
		"include-filter": "CropLatchingTest."
		},
		{
		"include-filter": "ChildLayerTest."
		},
		{
		"include-filter": "ScreenCaptureTest."
		},
		{
		"include-filter": "ScreenCaptureChildOnlyTest."
		},
		{
		"include-filter": "DereferenceSurfaceControlTest."
		},
		{
		"include-filter": "BoundlessLayerTest."
		},
		{
		"include-filter": "MultiDisplayLayerBoundsTest."
		},
		{
		"include-filter": "InvalidHandleTest."
		},
		{
		"include-filter": "VirtualDisplayTest."
		},
		{
		"include-filter": "RelativeZTest."
		},
		{
		"include-filter": "RefreshRateOverlayTest."
		}
		]
		}
		]
		}

+4 −7

Original line number	Diff line number	Diff line
		@@ -1225,10 +1225,7 @@ int main(int argc, char **argv)

		if (ret < 0) {
		for (int i = optind; i < argc; i++) {
		if (!setCategoryEnable(argv[i])) {
		fprintf(stderr, "error enabling tracing category \"%s\"\n", argv[i]);
		exit(1);
		}
		setCategoryEnable(argv[i]);
		}
		break;
		}
		@@ -1344,10 +1341,10 @@ int main(int argc, char **argv)
		// contain entries from only one CPU can cause "begin" entries without a
		// matching "end" entry to show up if a task gets migrated from one CPU to
		// another.
		if (!onlyUserspace)
		if (!onlyUserspace) {
		ok = clearTrace();

		writeClockSyncMarker();
		}
		if (ok && !async && !traceStream) {
		// Sleep to allow the trace to be captured.
		struct timespec timeLeft;

+2 −0

Original line number	Diff line number	Diff line
		@@ -63,6 +63,8 @@ on late-init
		chmod 0666 /sys/kernel/tracing/events/cpuhp/cpuhp_pause/enable
		chmod 0666 /sys/kernel/debug/tracing/events/power/gpu_frequency/enable
		chmod 0666 /sys/kernel/tracing/events/power/gpu_frequency/enable
		chmod 0666 /sys/kernel/debug/tracing/events/power/gpu_work_period/enable
		chmod 0666 /sys/kernel/tracing/events/power/gpu_work_period/enable
		chmod 0666 /sys/kernel/debug/tracing/events/power/suspend_resume/enable
		chmod 0666 /sys/kernel/tracing/events/power/suspend_resume/enable
		chmod 0666 /sys/kernel/debug/tracing/events/cpufreq_interactive/enable

+3 −3

Original line number	Diff line number	Diff line
		@@ -2418,7 +2418,7 @@ void Dumpstate::DumpstateBoard(int out_fd) {
		// Given that bugreport is required to diagnose failures, it's better to set an arbitrary amount
		// of timeout for IDumpstateDevice than to block the rest of bugreport. In the timeout case, we
		// will kill the HAL and grab whatever it dumped in time.
		constexpr size_t timeout_sec = 30;
		constexpr size_t timeout_sec = 45;

		if (dumpstate_hal_handle_aidl != nullptr) {
		DoDumpstateBoardAidl(dumpstate_hal_handle_aidl, dumpstate_fds, options_->bugreport_mode,
		@@ -2733,8 +2733,8 @@ void Dumpstate::DumpOptions::Initialize(BugreportMode bugreport_mode,
		const android::base::unique_fd& screenshot_fd_in,
		bool is_screenshot_requested) {
		// Duplicate the fds because the passed in fds don't outlive the binder transaction.
		bugreport_fd.reset(dup(bugreport_fd_in.get()));
		screenshot_fd.reset(dup(screenshot_fd_in.get()));
		bugreport_fd.reset(fcntl(bugreport_fd_in.get(), F_DUPFD_CLOEXEC, 0));
		screenshot_fd.reset(fcntl(screenshot_fd_in.get(), F_DUPFD_CLOEXEC, 0));

		SetOptionsFromMode(bugreport_mode, this, is_screenshot_requested);
		}