Snap for 11931036 from e32f5f0113958b29846021f0b9fdc993771c6209 to 24Q3-release (2f3c0dab) · Commits · e / os / android_frameworks_native

libs/sensor/libsensor_flags.aconfig

+7 −0

Original line number	Diff line number	Diff line
		@@ -8,3 +8,10 @@ flag {
		bug: "322228259"
		is_fixed_read_only: true
		}

		flag {
		name: "sensor_event_queue_report_sensor_usage_in_tracing"
		namespace: "sensors"
		description: "When this flag is enabled, sensor event queue will report sensor usage when system trace is enabled."
		bug: "333132224"
		}
		No newline at end of file

+5 −4

Original line number	Diff line number	Diff line
		@@ -4885,10 +4885,11 @@ InputEventInjectionResult InputDispatcher::injectInputEvent(const InputEvent* ev

		mLock.lock();

		if (policyFlags & POLICY_FLAG_FILTERED) {
		// The events from InputFilter impersonate real hardware devices. Check these
		// events for consistency and print an error. An inconsistent event sent from
		// InputFilter could cause a crash in the later stages of dispatching pipeline.
		{
		// Verify all injected streams, whether the injection is coming from apps or from
		// input filter. Print an error if the stream becomes inconsistent with this event.
		// An inconsistent injected event sent could cause a crash in the later stages of
		// dispatching pipeline.
		auto [it, _] =
		mInputFilterVerifiersByDisplay.try_emplace(displayId,
		std::string("Injection on ") +

+1 −1

Original line number	Diff line number	Diff line
		@@ -403,7 +403,7 @@ std::list<NotifyArgs> InputDevice::process(const RawEvent* rawEvents, size_t cou
		mDropUntilNextSync = true;
		} else {
		for_each_mapper_in_subdevice(rawEvent->deviceId, [&](InputMapper& mapper) {
		out += mapper.process(rawEvent);
		out += mapper.process(*rawEvent);
		});
		}
		--count;

+6 −6

Original line number	Diff line number	Diff line
		@@ -215,16 +215,16 @@ std::list<NotifyArgs> CursorInputMapper::reset(nsecs_t when) {
		return InputMapper::reset(when);
		}

		std::list<NotifyArgs> CursorInputMapper::process(const RawEvent* rawEvent) {
		std::list<NotifyArgs> CursorInputMapper::process(const RawEvent& rawEvent) {
		std::list<NotifyArgs> out;
		mCursorButtonAccumulator.process(*rawEvent);
		mCursorMotionAccumulator.process(*rawEvent);
		mCursorScrollAccumulator.process(*rawEvent);
		mCursorButtonAccumulator.process(rawEvent);
		mCursorMotionAccumulator.process(rawEvent);
		mCursorScrollAccumulator.process(rawEvent);

		if (rawEvent->type == EV_SYN && rawEvent->code == SYN_REPORT) {
		if (rawEvent.type == EV_SYN && rawEvent.code == SYN_REPORT) {
		const auto [eventTime, readTime] =
		applyBluetoothTimestampSmoothening(getDeviceContext().getDeviceIdentifier(),
		rawEvent->when, rawEvent->readTime,
		rawEvent.when, rawEvent.readTime,
		mLastEventTime);
		out += sync(eventTime, readTime);
		mLastEventTime = eventTime;

+1 −1

Original line number	Diff line number	Diff line
		@@ -62,7 +62,7 @@ public:
		const InputReaderConfiguration& readerConfig,
		ConfigurationChanges changes) override;
		[[nodiscard]] std::list<NotifyArgs> reset(nsecs_t when) override;
		[[nodiscard]] std::list<NotifyArgs> process(const RawEvent* rawEvent) override;
		[[nodiscard]] std::list<NotifyArgs> process(const RawEvent& rawEvent) override;

		virtual int32_t getScanCodeState(uint32_t sourceMask, int32_t scanCode) override;