diff options
| author | 2024-06-18 14:13:37 -0700 | |
|---|---|---|
| committer | 2024-06-18 14:13:37 -0700 | |
| commit | bb1814a0b94e8efb3fa3843c3d6a6533a382cac3 (patch) | |
| tree | 27e66123b9acee1a608b520afebbce3b6cd3c037 /services/inputflinger/InputManager.cpp | |
| parent | 13fde70bd413e24c6667ec8ad84ea0d9e07058d6 (diff) | |
| parent | 29f1274c966a27f929cf8d6f21a538d53a3f9ac3 (diff) | |
Merge 24Q3 (ab/11976889) to aosp-main-future
Bug: 347831320
Merged-In: I30f4c21dfee68603d0dad01d205f8a5581e6db31
Change-Id: I301c522ae67cc1f30fe0ddc819aa3dffd4c32d1a
Diffstat (limited to 'services/inputflinger/InputManager.cpp')
| -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) { |