summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndy McFadden <fadden@android.com>2013-04-30 17:47:26 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-04-30 17:47:26 -0700
commit80f9f26d1004a37e086c948609419ef1a8ae1467 (patch)
tree1b6d537f2dce04cc531914fe64f8cffc5e684263
parent565bce248b0a21f9cf42329d5b5d0aa6dd425959 (diff)
parentef4dbb6af3db147f4c25ae1d7013b1a30fd8fed2 (diff)
downloadframeworks_native-80f9f26d1004a37e086c948609419ef1a8ae1467.zip
frameworks_native-80f9f26d1004a37e086c948609419ef1a8ae1467.tar.gz
frameworks_native-80f9f26d1004a37e086c948609419ef1a8ae1467.tar.bz2
am ef4dbb6a: am 5d46b04b: Merge "Recommend different time source" into jb-mr2-dev
* commit 'ef4dbb6af3db147f4c25ae1d7013b1a30fd8fed2': Recommend different time source
-rw-r--r--opengl/specs/EGL_ANDROID_presentation_time.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/opengl/specs/EGL_ANDROID_presentation_time.txt b/opengl/specs/EGL_ANDROID_presentation_time.txt
index 03370ed..09b3938 100644
--- a/opengl/specs/EGL_ANDROID_presentation_time.txt
+++ b/opengl/specs/EGL_ANDROID_presentation_time.txt
@@ -107,8 +107,8 @@ Issues
presentation time when an absolute time is needed be queried on Android?
RESOLVED: The current clock value can be queried from the Java
- SystemClock#uptimeMillis() method or from the native clock_gettime
- function by passing CLOCK_MONOTONIC as the clock identifier.
+ System.nanoTime() method, or from the native clock_gettime function by
+ passing CLOCK_MONOTONIC as the clock identifier.
Revision History