summaryrefslogtreecommitdiffstats
path: root/services
diff options
context:
space:
mode:
authorJesse Hall <jessehall@google.com>2014-09-26 01:47:00 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-09-26 01:47:00 +0000
commit1b5c8839f7bbdebb3b30a6584e67402e8cb4a979 (patch)
tree6c9a6d3ca16c44d0d6cc24536122e6b1edf42e99 /services
parent8b4869dc832b098bd8de1fb20bf36ff8ae9c4d28 (diff)
parent728a8da14638e718ede11a7a894705524fc9d171 (diff)
downloadframeworks_native-1b5c8839f7bbdebb3b30a6584e67402e8cb4a979.zip
frameworks_native-1b5c8839f7bbdebb3b30a6584e67402e8cb4a979.tar.gz
frameworks_native-1b5c8839f7bbdebb3b30a6584e67402e8cb4a979.tar.bz2
am 728a8da1: Merge "surfaceflinger: Check sideband stream changed to trigger sideband Layer update." into lmp-dev
* commit '728a8da14638e718ede11a7a894705524fc9d171': surfaceflinger: Check sideband stream changed to trigger sideband Layer update.
Diffstat (limited to 'services')
-rw-r--r--services/surfaceflinger/Layer.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/services/surfaceflinger/Layer.h b/services/surfaceflinger/Layer.h
index e712523..f0fe58a 100644
--- a/services/surfaceflinger/Layer.h
+++ b/services/surfaceflinger/Layer.h
@@ -284,7 +284,7 @@ public:
/*
* Returns if a frame is queued.
*/
- bool hasQueuedFrame() const { return mQueuedFrames > 0; }
+ bool hasQueuedFrame() const { return mQueuedFrames > 0 || mSidebandStreamChanged; }
// -----------------------------------------------------------------------