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

Commit 821ac10b authored by Greg Hackmann's avatar Greg Hackmann Committed by Android Git Automerger
Browse files

am 07dbb562: am 9d1de8a8: am 0e23a3d4: am 215f78ae: Merge "toolbox: uptime:...

am 07dbb562: am 9d1de8a8: am 0e23a3d4: am 215f78ae: Merge "toolbox: uptime: use clock_gettime() on devices without /dev/alarm"

* commit '07dbb562':
  toolbox: uptime: use clock_gettime() on devices without /dev/alarm
parents 3fd9ca97 07dbb562
Loading
Loading
Loading
Loading
+14 −4
Original line number Diff line number Diff line
@@ -54,18 +54,28 @@ static void format_time(int time, char* buffer) {
        sprintf(buffer, "%02d:%02d:%02d", hours, minutes, seconds);
}

int64_t elapsedRealtime()
static int elapsedRealtimeAlarm(struct timespec *ts)
{
    struct timespec ts;
    int fd, result;

    fd = open("/dev/alarm", O_RDONLY);
    if (fd < 0)
        return fd;

   result = ioctl(fd, ANDROID_ALARM_GET_TIME(ANDROID_ALARM_ELAPSED_REALTIME), &ts);
    result = ioctl(fd, ANDROID_ALARM_GET_TIME(ANDROID_ALARM_ELAPSED_REALTIME), ts);
    close(fd);

    return result;
}

int64_t elapsedRealtime()
{
    struct timespec ts;

    int result = elapsedRealtimeAlarm(&ts);
    if (result < 0)
        result = clock_gettime(CLOCK_BOOTTIME, &ts);

    if (result == 0)
        return ts.tv_sec;
    return -1;