summaryrefslogtreecommitdiffstats
path: root/services/surfaceflinger/Layer.h
diff options
context:
space:
mode:
authorEric Penner <epenner@google.com>2014-07-28 19:51:58 -0700
committerEric Penner <epenner@google.com>2014-07-30 19:05:38 -0700
commit51c59cd1e73be3787eb75bebd87fc41739c65adb (patch)
tree5ba32fda6ae13fa1aa94e3cb2db6f00e1cf9d16c /services/surfaceflinger/Layer.h
parentd8e5e813433c5c5e4fea29a24d993b5cfe436fe0 (diff)
downloadframeworks_native-51c59cd1e73be3787eb75bebd87fc41739c65adb.zip
frameworks_native-51c59cd1e73be3787eb75bebd87fc41739c65adb.tar.gz
frameworks_native-51c59cd1e73be3787eb75bebd87fc41739c65adb.tar.bz2
SurfaceFlinger: Prevent deadlock by updating an atomic layer set.
Bug: 12934849 Change-Id: I9dede7316f1e967de4140bd731ac810115ea302f
Diffstat (limited to 'services/surfaceflinger/Layer.h')
-rw-r--r--services/surfaceflinger/Layer.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/services/surfaceflinger/Layer.h b/services/surfaceflinger/Layer.h
index 2d8084d..765f179 100644
--- a/services/surfaceflinger/Layer.h
+++ b/services/surfaceflinger/Layer.h
@@ -277,6 +277,11 @@ public:
*/
Rect getContentCrop() const;
+ /*
+ * Returns if a frame is queued.
+ */
+ bool hasQueuedFrame() const { return mQueuedFrames > 0; }
+
// -----------------------------------------------------------------------
void clearWithOpenGL(const sp<const DisplayDevice>& hw, const Region& clip) const;