Merge "Remove custom timestamp from hw/libhw/input"
am: 6b14bd1a08
Change-Id: If9a4cf1d3ac09a1a1b853951f3af417669f10c54
diff --git a/modules/input/evdev/InputDevice.cpp b/modules/input/evdev/InputDevice.cpp
index 3b72f1f..a1bce64 100644
--- a/modules/input/evdev/InputDevice.cpp
+++ b/modules/input/evdev/InputDevice.cpp
@@ -37,8 +37,6 @@
#include "MouseInputMapper.h"
#include "SwitchInputMapper.h"
-#define MSC_ANDROID_TIME_SEC 0x6
-#define MSC_ANDROID_TIME_USEC 0x7
namespace android {
@@ -240,25 +238,6 @@
event.value);
#endif
- if (event.type == EV_MSC) {
- if (event.code == MSC_ANDROID_TIME_SEC) {
- mOverrideSec = event.value;
- } else if (event.code == MSC_ANDROID_TIME_USEC) {
- mOverrideUsec = event.value;
- }
- return;
- }
-
- if (mOverrideSec || mOverrideUsec) {
- event.when = s2ns(mOverrideSec) + us2ns(mOverrideUsec);
- ALOGV("applied override time %d.%06d", mOverrideSec, mOverrideUsec);
-
- if (event.type == EV_SYN && event.code == SYN_REPORT) {
- mOverrideSec = 0;
- mOverrideUsec = 0;
- }
- }
-
// Bug 7291243: Add a guard in case the kernel generates timestamps
// that appear to be far into the future because they were generated
// using the wrong clock source.
diff --git a/modules/input/evdev/InputDevice.h b/modules/input/evdev/InputDevice.h
index 6892778..a1e9e98 100644
--- a/modules/input/evdev/InputDevice.h
+++ b/modules/input/evdev/InputDevice.h
@@ -72,9 +72,6 @@
InputDeviceHandle* mDeviceHandle = nullptr;
std::vector<std::unique_ptr<InputMapper>> mMappers;
uint32_t mClasses = 0;
-
- int32_t mOverrideSec = 0;
- int32_t mOverrideUsec = 0;
};
/* Input device classes. */
diff --git a/tests/input/evdev/InputDevice_test.cpp b/tests/input/evdev/InputDevice_test.cpp
index bd57491..8f8a94b 100644
--- a/tests/input/evdev/InputDevice_test.cpp
+++ b/tests/input/evdev/InputDevice_test.cpp
@@ -31,8 +31,6 @@
// # of milliseconds to allow for timing measurements
#define TIMING_TOLERANCE_MS 25
-#define MSC_ANDROID_TIME_SEC 0x6
-#define MSC_ANDROID_TIME_USEC 0x7
using ::testing::_;
using ::testing::NiceMock;
@@ -66,35 +64,6 @@
NiceMock<MockInputDeviceDefinition> mDeviceDef;
};
-TEST_F(EvdevDeviceTest, testOverrideTime) {
- auto node = std::make_shared<MockInputDeviceNode>();
- auto device = std::make_unique<EvdevDevice>(&mHost, node);
- ASSERT_TRUE(device != nullptr);
-
- // Send two timestamp override events before an input event.
- nsecs_t when = 2ULL;
- InputEvent msc1 = { when, EV_MSC, MSC_ANDROID_TIME_SEC, 1 };
- InputEvent msc2 = { when, EV_MSC, MSC_ANDROID_TIME_USEC, 900000 };
-
- // Send a key down and syn. Should get the overridden timestamp.
- InputEvent keyDown = { when, EV_KEY, KEY_HOME, 1 };
- InputEvent syn = { when, EV_SYN, SYN_REPORT, 0 };
-
- // Send a key up, which should be at the reported timestamp.
- InputEvent keyUp = { when, EV_KEY, KEY_HOME, 0 };
-
- device->processInput(msc1, when);
- device->processInput(msc2, when);
- device->processInput(keyDown, when);
- device->processInput(syn, when);
- device->processInput(keyUp, when);
-
- nsecs_t expectedWhen = s2ns(1) + us2ns(900000);
- EXPECT_EQ(expectedWhen, keyDown.when);
- EXPECT_EQ(expectedWhen, syn.when);
- EXPECT_EQ(when, keyUp.when);
-}
-
TEST_F(EvdevDeviceTest, testWrongClockCorrection) {
auto node = std::make_shared<MockInputDeviceNode>();
auto device = std::make_unique<EvdevDevice>(&mHost, node);