diff options
| -rw-r--r-- | services/inputflinger/Android.bp | 2 | ||||
| -rw-r--r-- | services/inputflinger/InputReader.cpp | 2 | ||||
| -rw-r--r-- | services/inputflinger/tests/InputReader_test.cpp | 4 |
3 files changed, 3 insertions, 5 deletions
diff --git a/services/inputflinger/Android.bp b/services/inputflinger/Android.bp index 622a623644..9a65452f60 100644 --- a/services/inputflinger/Android.bp +++ b/services/inputflinger/Android.bp @@ -41,8 +41,6 @@ cc_library_shared { "-Wall", "-Wextra", "-Werror", - // Allow implicit fallthroughs in InputReader.cpp until they are fixed. - "-Wno-error=implicit-fallthrough", "-Wno-unused-parameter", // TODO: Move inputflinger to its own process and mark it hidden //-fvisibility=hidden diff --git a/services/inputflinger/InputReader.cpp b/services/inputflinger/InputReader.cpp index 869a2fc170..869bd71487 100644 --- a/services/inputflinger/InputReader.cpp +++ b/services/inputflinger/InputReader.cpp @@ -1041,7 +1041,7 @@ void InputDevice::setEnabled(bool enabled, nsecs_t when) { void InputDevice::dump(std::string& dump) { InputDeviceInfo deviceInfo; - getDeviceInfo(& deviceInfo); + getDeviceInfo(&deviceInfo); dump += StringPrintf(INDENT "Device %d: %s\n", deviceInfo.getId(), deviceInfo.getDisplayName().c_str()); diff --git a/services/inputflinger/tests/InputReader_test.cpp b/services/inputflinger/tests/InputReader_test.cpp index 707f3c5040..6114f51c46 100644 --- a/services/inputflinger/tests/InputReader_test.cpp +++ b/services/inputflinger/tests/InputReader_test.cpp @@ -1082,7 +1082,7 @@ protected: // --- InputReaderPolicyTest --- class InputReaderPolicyTest : public testing::Test { - protected: +protected: sp<FakeInputReaderPolicy> mFakePolicy; virtual void SetUp() { @@ -1101,7 +1101,7 @@ class InputReaderPolicyTest : public testing::Test { * Such configuration is not currently allowed. */ TEST_F(InputReaderPolicyTest, Viewports_GetCleared) { - const std::string uniqueId = "local:0"; + static const std::string uniqueId = "local:0"; // We didn't add any viewports yet, so there shouldn't be any. std::optional<DisplayViewport> internalViewport = |