diff options
| author | 2024-05-03 23:19:01 +0000 | |
|---|---|---|
| committer | 2024-05-04 00:07:41 +0000 | |
| commit | 657786c7dcaad2f3b700f19273c2831f21a810df (patch) | |
| tree | 29bae4fdf143b84b91b71948f9bc36a7e9bb1e7a | |
| parent | 0b4891a9a5de0f00f1432520d5db6d1eef4b66e5 (diff) | |
InputManager: Cleanup after PointerChoreographer refactor
Bug: 311416205
Test: atest inputflinger_tests
Change-Id: I48140dcc58f21e801efe42e51a19c8e028b206b7
| -rw-r--r-- | services/inputflinger/InputManager.cpp | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/services/inputflinger/InputManager.cpp b/services/inputflinger/InputManager.cpp index ae066c0f4a..41e5247b50 100644 --- a/services/inputflinger/InputManager.cpp +++ b/services/inputflinger/InputManager.cpp @@ -41,7 +41,6 @@ namespace { const bool ENABLE_INPUT_DEVICE_USAGE_METRICS = sysprop::InputProperties::enable_input_device_usage_metrics().value_or(true); -const bool ENABLE_POINTER_CHOREOGRAPHER = input_flags::enable_pointer_choreographer(); const bool ENABLE_INPUT_FILTER_RUST = input_flags::enable_input_filter_rust_impl(); int32_t exceptionCodeFromStatusT(status_t status) { @@ -152,12 +151,10 @@ InputManager::InputManager(const sp<InputReaderPolicyInterface>& readerPolicy, mTracingStages.emplace_back( std::make_unique<TracedInputListener>("InputProcessor", *mProcessor)); - if (ENABLE_POINTER_CHOREOGRAPHER) { - mChoreographer = - std::make_unique<PointerChoreographer>(*mTracingStages.back(), choreographerPolicy); - mTracingStages.emplace_back( - std::make_unique<TracedInputListener>("PointerChoreographer", *mChoreographer)); - } + mChoreographer = + std::make_unique<PointerChoreographer>(*mTracingStages.back(), choreographerPolicy); + mTracingStages.emplace_back( + std::make_unique<TracedInputListener>("PointerChoreographer", *mChoreographer)); mBlocker = std::make_unique<UnwantedInteractionBlocker>(*mTracingStages.back()); mTracingStages.emplace_back( @@ -245,10 +242,8 @@ void InputManager::dump(std::string& dump) { dump += '\n'; mBlocker->dump(dump); dump += '\n'; - if (ENABLE_POINTER_CHOREOGRAPHER) { - mChoreographer->dump(dump); - dump += '\n'; - } + mChoreographer->dump(dump); + dump += '\n'; mProcessor->dump(dump); dump += '\n'; if (ENABLE_INPUT_DEVICE_USAGE_METRICS) { |