diff options
| -rw-r--r-- | services/inputflinger/dispatcher/InputDispatcher.cpp | 26 | ||||
| -rw-r--r-- | services/inputflinger/dispatcher/InputDispatcher.h | 3 |
2 files changed, 1 insertions, 28 deletions
diff --git a/services/inputflinger/dispatcher/InputDispatcher.cpp b/services/inputflinger/dispatcher/InputDispatcher.cpp index 4825cc8eab..d1930f1867 100644 --- a/services/inputflinger/dispatcher/InputDispatcher.cpp +++ b/services/inputflinger/dispatcher/InputDispatcher.cpp @@ -4732,7 +4732,6 @@ void InputDispatcher::notifySwitch(const NotifySwitchArgs& args) { } void InputDispatcher::notifyDeviceReset(const NotifyDeviceResetArgs& args) { - // TODO(b/308677868) Remove device reset from the InputListener interface if (debugInboundEventDetails()) { ALOGD("notifyDeviceReset - eventTime=%" PRId64 ", deviceId=%d", args.eventTime, args.deviceId); @@ -4883,30 +4882,6 @@ 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. - auto [it, _] = - mInputFilterVerifiersByDisplay - .try_emplace(displayId, - StringPrintf("Injection on %" PRId32, displayId)); - InputVerifier& verifier = it->second; - - Result<void> result = - verifier.processMovement(resolvedDeviceId, motionEvent.getSource(), - motionEvent.getAction(), - motionEvent.getPointerCount(), - motionEvent.getPointerProperties(), - motionEvent.getSamplePointerCoords(), flags); - if (!result.ok()) { - logDispatchStateLocked(); - LOG(ERROR) << "Inconsistent event: " << motionEvent - << ", reason: " << result.error(); - } - } - const nsecs_t* sampleEventTimes = motionEvent.getSampleEventTimes(); const size_t pointerCount = motionEvent.getPointerCount(); const std::vector<PointerProperties> @@ -6970,7 +6945,6 @@ void InputDispatcher::displayRemoved(int32_t displayId) { // Remove the associated touch mode state. mTouchModePerDisplay.erase(displayId); mVerifiersByDisplay.erase(displayId); - mInputFilterVerifiersByDisplay.erase(displayId); } // release lock // Wake up poll loop since it may need to make new input dispatching choices. diff --git a/services/inputflinger/dispatcher/InputDispatcher.h b/services/inputflinger/dispatcher/InputDispatcher.h index 60f667c1f3..3579a67c96 100644 --- a/services/inputflinger/dispatcher/InputDispatcher.h +++ b/services/inputflinger/dispatcher/InputDispatcher.h @@ -298,8 +298,7 @@ private: void transformMotionEntryForInjectionLocked(MotionEntry&, const ui::Transform& injectedTransform) const REQUIRES(mLock); - // Per-display correction of injected events - std::map</*displayId*/ int32_t, InputVerifier> mInputFilterVerifiersByDisplay GUARDED_BY(mLock); + std::condition_variable mInjectionSyncFinished; void incrementPendingForegroundDispatches(const EventEntry& entry); void decrementPendingForegroundDispatches(const EventEntry& entry); |