Use EVIOCSCLOCKID correctly.
Bug: 6382031
Change-Id: I87b0887ce867a79758bcd24e2202280270faaf8c
diff --git a/services/input/EventHub.cpp b/services/input/EventHub.cpp
index 6ec020c..f80ac18 100644
--- a/services/input/EventHub.cpp
+++ b/services/input/EventHub.cpp
@@ -1194,7 +1194,8 @@
// As of Linux 3.4, there is a new EVIOCSCLOCKID ioctl to set the desired clock.
// Therefore, we no longer require the Android-specific kernel patch described above
// as long as we make sure to set select the monotonic clock. We do that here.
- bool usingClockIoctl = !ioctl(fd, EVIOCSCLOCKID, CLOCK_MONOTONIC);
+ int clockId = CLOCK_MONOTONIC;
+ bool usingClockIoctl = !ioctl(fd, EVIOCSCLOCKID, &clockId);
ALOGI("New device: id=%d, fd=%d, path='%s', name='%s', classes=0x%x, "
"configuration='%s', keyLayout='%s', keyCharacterMap='%s', builtinKeyboard=%s, "
diff --git a/services/java/com/android/server/PowerManagerService.java b/services/java/com/android/server/PowerManagerService.java
index 5ec1fa5..5799f2b 100644
--- a/services/java/com/android/server/PowerManagerService.java
+++ b/services/java/com/android/server/PowerManagerService.java
@@ -2709,6 +2709,12 @@
}
private void goToSleepLocked(long time, int reason) {
+ if (mSpew) {
+ Exception ex = new Exception();
+ ex.fillInStackTrace();
+ Slog.d(TAG, "goToSleep mLastEventTime=" + mLastEventTime + " time=" + time
+ + " reason=" + reason, ex);
+ }
if (mLastEventTime <= time) {
mLastEventTime = time;