aboutsummaryrefslogtreecommitdiffstats
path: root/include/system
diff options
context:
space:
mode:
authorGlenn Kasten <gkasten@google.com>2011-07-01 15:02:06 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-07-01 15:02:06 -0700
commit1f311f2f160853bebab70d31dabf17aa1a83f2a6 (patch)
treecd815941f19e78903d9f17da20002278457b8c55 /include/system
parent856f63c0df9cd4e8783ca65140fe386e3a98a274 (diff)
parentc322f67140d52014c47dff41d03a601b251f56ed (diff)
downloadsystem_core-1f311f2f160853bebab70d31dabf17aa1a83f2a6.tar.gz
system_core-1f311f2f160853bebab70d31dabf17aa1a83f2a6.tar.bz2
system_core-1f311f2f160853bebab70d31dabf17aa1a83f2a6.zip
Merge "Bug 4571308 Timestamps are not always monotonic"
Diffstat (limited to 'include/system')
-rw-r--r--include/system/window.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/include/system/window.h b/include/system/window.h
index 5762a500..eef567db 100644
--- a/include/system/window.h
+++ b/include/system/window.h
@@ -441,8 +441,10 @@ static inline int native_window_set_buffers_transform(
* All buffers queued after this call will be associated with the timestamp
* parameter specified. If the timestamp is set to NATIVE_WINDOW_TIMESTAMP_AUTO
* (the default), timestamps will be generated automatically when queueBuffer is
- * called. The timestamp is measured in nanoseconds, and must be monotonically
- * increasing.
+ * called. The timestamp is measured in nanoseconds, and is normally monotonically
+ * increasing. The timestamp should be unaffected by time-of-day adjustments,
+ * and for a camera should be strictly monotonic but for a media player may be
+ * reset when the position is set.
*/
static inline int native_window_set_buffers_timestamp(
struct ANativeWindow* window,