summaryrefslogtreecommitdiffstats
path: root/include/gui
diff options
context:
space:
mode:
authorJamie Gennis <jgennis@google.com>2011-11-21 21:08:21 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2011-11-21 21:08:21 -0800
commit07f062b6271e7ec820d1079566e7451a9cf55558 (patch)
tree57d9f1caf0e0ab9ed8d13a00f1391bdb7823edf7 /include/gui
parent53d42cb7d3c5c35b63363abbe9c44b8f6961afd4 (diff)
parentc25972950c2ea62fb085524dbe737c2bf0f08f4a (diff)
downloadframeworks_base-07f062b6271e7ec820d1079566e7451a9cf55558.zip
frameworks_base-07f062b6271e7ec820d1079566e7451a9cf55558.tar.gz
frameworks_base-07f062b6271e7ec820d1079566e7451a9cf55558.tar.bz2
am c2597295: am 53cf2020: Merge changes I37fd43b5,I91eb29db,I0491ce35 into ics-mr1
* commit 'c25972950c2ea62fb085524dbe737c2bf0f08f4a': SurfaceTexture: fix a couple tests EGL: default to swap interval 1 SurfaceTexture: clean up some tests
Diffstat (limited to 'include/gui')
-rw-r--r--include/gui/SurfaceTexture.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/include/gui/SurfaceTexture.h b/include/gui/SurfaceTexture.h
index 27d863d..15c2bab 100644
--- a/include/gui/SurfaceTexture.h
+++ b/include/gui/SurfaceTexture.h
@@ -202,6 +202,10 @@ public:
// getCurrentScalingMode returns the scaling mode of the current buffer
uint32_t getCurrentScalingMode() const;
+ // isSynchronousMode returns whether the SurfaceTexture is currently in
+ // synchronous mode.
+ bool isSynchronousMode() const;
+
// abandon frees all the buffers and puts the SurfaceTexture into the
// 'abandoned' state. Once put in this state the SurfaceTexture can never
// leave it. When in the 'abandoned' state, all methods of the