Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 140651b3 authored by Jeff Brown's avatar Jeff Brown Committed by Android Git Automerger
Browse files

am 8802ef02: am 69387f43: Merge "Use EVIOCSCLOCKID correctly." into jb-dev 

* commit '8802ef02':
  Use EVIOCSCLOCKID correctly.
parents 92f29230 8802ef02

services/input/EventHub.cpp

+2 −1
Original line number Diff line number Diff line
@@ -1194,7 +1194,8 @@ status_t EventHub::openDeviceLocked(const char *devicePath) { 
    // 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, "

services/java/com/android/server/PowerManagerService.java

+6 −0
Original line number Diff line number Diff line
@@ -2709,6 +2709,12 @@ public class PowerManagerService extends IPowerManager.Stub 
    }



    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;