am 70f93fb5: Merge "Disable the use of clock_gettime for now." into jb-mr1-dev

{

{

#ifdef HAVE_ANDROID_OS

#ifdef HAVE_ANDROID_OS

    struct timespec ts;

    struct timespec ts;

    int result = clock_gettime(CLOCK_BOOTTIME, &ts);

    int result;

    int64_t timestamp;

    int64_t timestamp;

    static volatile int64_t prevTimestamp;

    static volatile int64_t prevTimestamp;

    static volatile int prevMethod;

    static volatile int prevMethod;

#if 0

    /*

     * b/7100774

     * clock_gettime appears to have clock skews and can sometimes return

     * backwards values. Disable its use until we find out what's wrong.

     */

    result = clock_gettime(CLOCK_BOOTTIME, &ts);

    if (result == 0) {

    if (result == 0) {

        timestamp = seconds_to_nanoseconds(ts.tv_sec) + ts.tv_nsec;

        timestamp = seconds_to_nanoseconds(ts.tv_sec) + ts.tv_nsec;

        checkTimeStamps(timestamp, &prevTimestamp, &prevMethod,

        checkTimeStamps(timestamp, &prevTimestamp, &prevMethod,

                        METHOD_CLOCK_GETTIME);

                        METHOD_CLOCK_GETTIME);

        return timestamp;

        return timestamp;

    }

    }

#endif

    // CLOCK_BOOTTIME doesn't exist, fallback to /dev/alarm

    // CLOCK_BOOTTIME doesn't exist, fallback to /dev/alarm

    static int s_fd = -1;

    static int s_fd = -1;