commit 249afbf18dbb611b3e02f81db1b0ec0a5bf6e92d
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Aug 12 03:47:55 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Aug 12 03:47:55 2020 +0000
tree 73c8ab1c88e6af2f2a5218e30b0feb6bef76f2db
parent 90f1e105533cecf0c3ae0480516d5533855fa851
parent 3cab9b64856e19926609bcf7a62bcf2dfc8a9388

Merge "Remove eventTime from MotionEntry"

services/inputflinger/Android.bp

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",
     ],
 }
 

services/inputflinger/dispatcher/Entry.cpp

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),

services/inputflinger/dispatcher/Entry.h

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;