summaryrefslogtreecommitdiffstats
path: root/opengl
diff options
context:
space:
mode:
authorAndy McFadden <fadden@android.com>2013-04-30 17:45:36 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-04-30 17:45:36 -0700
commitef4dbb6af3db147f4c25ae1d7013b1a30fd8fed2 (patch)
tree19797903948791702bb643f19cdde4c176b0bc66 /opengl
parent8369c4739a58367e9636c84facc272cf8ddcb070 (diff)
parent5d46b04bd5a8ec00ea527b68aa48907d3978a007 (diff)
downloadframeworks_native-ef4dbb6af3db147f4c25ae1d7013b1a30fd8fed2.zip
frameworks_native-ef4dbb6af3db147f4c25ae1d7013b1a30fd8fed2.tar.gz
frameworks_native-ef4dbb6af3db147f4c25ae1d7013b1a30fd8fed2.tar.bz2
am 5d46b04b: Merge "Recommend different time source" into jb-mr2-dev
* commit '5d46b04bd5a8ec00ea527b68aa48907d3978a007': Recommend different time source
Diffstat (limited to 'opengl')
-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