Remove eventTime from MotionEntry
EventEntry, the base class for MotionEntry, already has field
'eventTime'. However, MotionEntry was defining its own 'eventTime'.
Remove it.
This was discovered by setting '-Wshadow-all'.
However, setting that flag does not allow having initializer lists where
parameter name matches the field name.
Therefore, avoid "-Wshadow-all" and just turn on some of the additional
checks that it provides.
Bug: 142017994
Test: m sync inputflinger_tests libinput_tests inputflinger_benchmarks StructLayout_test libgui_test inputflinger_benchmarks
Change-Id: I6c62fe4362bac09731c3855537db6bf3b7493ec1
diff --git a/services/inputflinger/Android.bp b/services/inputflinger/Android.bp
index d1a3e9a..28cce47 100644
--- a/services/inputflinger/Android.bp
+++ b/services/inputflinger/Android.bp
@@ -22,6 +22,8 @@
"-Wno-unused-parameter",
"-Wthread-safety",
"-Wshadow",
+ "-Wshadow-field-in-constructor-modified",
+ "-Wshadow-uncaptured-local",
],
}
diff --git a/services/inputflinger/dispatcher/Entry.cpp b/services/inputflinger/dispatcher/Entry.cpp
index ded74ba..4328e03 100644
--- a/services/inputflinger/dispatcher/Entry.cpp
+++ b/services/inputflinger/dispatcher/Entry.cpp
@@ -185,7 +185,6 @@
uint32_t pointerCount, const PointerProperties* pointerProperties,
const PointerCoords* pointerCoords, float xOffset, float yOffset)
: EventEntry(id, Type::MOTION, eventTime, policyFlags),
- eventTime(eventTime),
deviceId(deviceId),
source(source),
displayId(displayId),
diff --git a/services/inputflinger/dispatcher/Entry.h b/services/inputflinger/dispatcher/Entry.h
index 5fd772e..d5b589e 100644
--- a/services/inputflinger/dispatcher/Entry.h
+++ b/services/inputflinger/dispatcher/Entry.h
@@ -156,7 +156,6 @@
};
struct MotionEntry : EventEntry {
- nsecs_t eventTime;
int32_t deviceId;
uint32_t source;
int32_t displayId;