summaryrefslogtreecommitdiff
path: root/services/surfaceflinger/SurfaceFlinger.cpp
diff options
context:
space:
mode:
author Rob Carr <racarr@google.com> 2020-06-02 20:21:05 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2020-06-02 20:21:05 +0000
commitc43da98656bbf1944991b5d3fa415e2a8f2c966c (patch)
tree3d6041a0acef8e07db4ae9a52d6265a705e47e2a /services/surfaceflinger/SurfaceFlinger.cpp
parentab63fa0eb5722b30e4e3f0340f80b9662f6fc494 (diff)
parent7ec777d9452c236a546c5811ff31f5800ec7ef58 (diff)
Merge "DO NOT MERGE: SurfaceFlinger: Don't wake for pending transactions." into rvc-dev
Diffstat (limited to 'services/surfaceflinger/SurfaceFlinger.cpp')
-rw-r--r--services/surfaceflinger/SurfaceFlinger.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index 83f49dd46b..2e2273594e 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -3243,6 +3243,10 @@ uint32_t SurfaceFlinger::setTransactionFlags(uint32_t flags,
return old;
}
+uint32_t SurfaceFlinger::setTransactionFlagsNoWake(uint32_t flags) {
+ return mTransactionFlags.fetch_or(flags);
+}
+
bool SurfaceFlinger::flushTransactionQueues() {
// to prevent onHandleDestroyed from being called while the lock is held,
// we must keep a copy of the transactions (specifically the composer