Merge "TouchpadInputFuzzer: always set X and Y axes" into main (368995e6) · Commits · e / os / android_frameworks_native

services/inputflinger/tests/fuzzers/TouchpadInputFuzzer.cpp

+20 −15

Original line number	Diff line number	Diff line
		@@ -31,7 +31,6 @@ namespace android {
		namespace {

		void setAxisInfo(ThreadSafeFuzzedDataProvider& fdp, FuzzEventHub& eventHub, int32_t id, int axis) {
		if (fdp.ConsumeBool()) {
		eventHub.setAbsoluteAxisInfo(id, axis,
		RawAbsoluteAxisInfo{
		.minValue = fdp.ConsumeIntegral<int32_t>(),
		@@ -41,18 +40,24 @@ void setAxisInfo(ThreadSafeFuzzedDataProvider& fdp, FuzzEventHub& eventHub, int3
		.resolution = fdp.ConsumeIntegral<int32_t>(),
		});
		}

		void maybeSetAxisInfo(ThreadSafeFuzzedDataProvider& fdp, FuzzEventHub& eventHub, int32_t id,
		int axis) {
		if (fdp.ConsumeBool()) {
		setAxisInfo(fdp, eventHub, id, axis);
		}
		}

		void setAxisInfos(ThreadSafeFuzzedDataProvider& fdp, FuzzEventHub& eventHub, int32_t id) {
		setAxisInfo(fdp, eventHub, id, ABS_MT_SLOT);
		maybeSetAxisInfo(fdp, eventHub, id, ABS_MT_SLOT);
		setAxisInfo(fdp, eventHub, id, ABS_MT_POSITION_X);
		setAxisInfo(fdp, eventHub, id, ABS_MT_POSITION_Y);
		setAxisInfo(fdp, eventHub, id, ABS_MT_PRESSURE);
		setAxisInfo(fdp, eventHub, id, ABS_MT_ORIENTATION);
		setAxisInfo(fdp, eventHub, id, ABS_MT_TOUCH_MAJOR);
		setAxisInfo(fdp, eventHub, id, ABS_MT_TOUCH_MINOR);
		setAxisInfo(fdp, eventHub, id, ABS_MT_WIDTH_MAJOR);
		setAxisInfo(fdp, eventHub, id, ABS_MT_WIDTH_MINOR);
		maybeSetAxisInfo(fdp, eventHub, id, ABS_MT_PRESSURE);
		maybeSetAxisInfo(fdp, eventHub, id, ABS_MT_ORIENTATION);
		maybeSetAxisInfo(fdp, eventHub, id, ABS_MT_TOUCH_MAJOR);
		maybeSetAxisInfo(fdp, eventHub, id, ABS_MT_TOUCH_MINOR);
		maybeSetAxisInfo(fdp, eventHub, id, ABS_MT_WIDTH_MAJOR);
		maybeSetAxisInfo(fdp, eventHub, id, ABS_MT_WIDTH_MINOR);
		}

		const std::vector<std::string> boolPropertiesToFuzz = {