summaryrefslogtreecommitdiffstats
path: root/include/gui
diff options
context:
space:
mode:
authorJamie Gennis <jgennis@google.com>2011-11-21 15:56:11 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2011-11-21 15:56:11 -0800
commitc25972950c2ea62fb085524dbe737c2bf0f08f4a (patch)
tree24c85cfe0be4fac71f9f73895da8963fe9e2629e /include/gui
parent281d1072b4d880f70016d4553c7fcc25c00c89d3 (diff)
parent53cf20202a3848a6c61b5229814268180a3d2f16 (diff)
downloadframeworks_base-c25972950c2ea62fb085524dbe737c2bf0f08f4a.zip
frameworks_base-c25972950c2ea62fb085524dbe737c2bf0f08f4a.tar.gz
frameworks_base-c25972950c2ea62fb085524dbe737c2bf0f08f4a.tar.bz2
am 53cf2020: Merge changes I37fd43b5,I91eb29db,I0491ce35 into ics-mr1
* commit '53cf20202a3848a6c61b5229814268180a3d2f16': 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