Merge "Revert "Use CLOCK_MONOTONIC_RAW for System.nanoTime.""

2 files changed, 2 insertions, 7 deletions

diff --git a/luni/src/main/java/java/lang/System.java b/luni/src/main/java/java/lang/System.java
index 46aed59..c825118 100644
--- a/luni/src/main/java/java/lang/System.java
+++ b/luni/src/main/java/java/lang/System.java
@@ -170,8 +170,7 @@ public final class System {
 
     /**
      * Returns the current timestamp of the most precise timer available on the
-     * local system, in nanoseconds. Equivalent to something like Linux's
-     * {@code CLOCK_MONOTONIC_RAW}.
+     * local system, in nanoseconds. Equivalent to Linux's {@code CLOCK_MONOTONIC}.
      *
      * <p>This timestamp should only be used to measure a duration by comparing it
      * against another timestamp from the same process on the same device.
diff --git a/luni/src/main/native/java_lang_System.cpp b/luni/src/main/native/java_lang_System.cpp
index 2c48309..0686310 100644
--- a/luni/src/main/native/java_lang_System.cpp
+++ b/luni/src/main/native/java_lang_System.cpp
@@ -94,11 +94,7 @@ static jlong System_currentTimeMillis(JNIEnv*, jclass) {
 
 static jlong System_nanoTime(JNIEnv*, jclass) {
     timespec now;
-#ifdef CLOCK_MONOTONIC_RAW
-    clock_gettime(CLOCK_MONOTONIC_RAW, &now);
-#else // Darwin, say.
-  clock_gettime(CLOCK_MONOTONIC, &now);
-#endif
+    clock_gettime(CLOCK_MONOTONIC, &now);
     return now.tv_sec * 1000000000LL + now.tv_nsec;
 }