Skip to content

Commit 4961d9b

Browse files
Vaibhav DevmurariAndroid (Google) Code Review
authored andcommitted
Merge "Flag cleanup: enable_input_filter_rust_impl" into main
2 parents 23069b3 + e754bff commit 4961d9b

2 files changed

Lines changed: 6 additions & 19 deletions

File tree

libs/input/input_flags.aconfig

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -78,13 +78,6 @@ flag {
7878
bug: "301216095"
7979
}
8080

81-
flag {
82-
name: "enable_input_filter_rust_impl"
83-
namespace: "input"
84-
description: "Enable input filter rust implementation"
85-
bug: "294546335"
86-
}
87-
8881
flag {
8982
name: "override_key_behavior_permission_apis"
9083
is_exported: true

services/inputflinger/InputManager.cpp

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,6 @@ namespace {
4141
const bool ENABLE_INPUT_DEVICE_USAGE_METRICS =
4242
sysprop::InputProperties::enable_input_device_usage_metrics().value_or(true);
4343

44-
const bool ENABLE_INPUT_FILTER_RUST = input_flags::enable_input_filter_rust_impl();
45-
4644
int32_t exceptionCodeFromStatusT(status_t status) {
4745
switch (status) {
4846
case OK:
@@ -134,12 +132,10 @@ InputManager::InputManager(const sp<InputReaderPolicyInterface>& readerPolicy,
134132
mTracingStages.emplace_back(
135133
std::make_unique<TracedInputListener>("InputDispatcher", *mDispatcher));
136134

137-
if (ENABLE_INPUT_FILTER_RUST) {
138-
mInputFilter = std::make_unique<InputFilter>(*mTracingStages.back(), *mInputFlingerRust,
139-
inputFilterPolicy);
140-
mTracingStages.emplace_back(
141-
std::make_unique<TracedInputListener>("InputFilter", *mInputFilter));
142-
}
135+
mInputFilter = std::make_unique<InputFilter>(*mTracingStages.back(), *mInputFlingerRust,
136+
inputFilterPolicy);
137+
mTracingStages.emplace_back(
138+
std::make_unique<TracedInputListener>("InputFilter", *mInputFilter));
143139

144140
if (ENABLE_INPUT_DEVICE_USAGE_METRICS) {
145141
mCollector = std::make_unique<InputDeviceMetricsCollector>(*mTracingStages.back());
@@ -250,10 +246,8 @@ void InputManager::dump(std::string& dump) {
250246
mCollector->dump(dump);
251247
dump += '\n';
252248
}
253-
if (ENABLE_INPUT_FILTER_RUST) {
254-
mInputFilter->dump(dump);
255-
dump += '\n';
256-
}
249+
mInputFilter->dump(dump);
250+
dump += '\n';
257251
mDispatcher->dump(dump);
258252
dump += '\n';
259253
}

0 commit comments

Comments
 (0)