summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jorim Jaggi <jjaggi@google.com> 2019-07-23 18:34:06 -0700
committer android-build-merger <android-build-merger@google.com> 2019-07-23 18:34:06 -0700
commitd717a27ba4dab5eabd0d20ab81bd60c1b4c0f80f (patch)
treef5bcb43debfd2f5be32914a3b999d7005f1820d4
parent74d87f731e55d0241b0b6d098ac5161ca42887d1 (diff)
parenta604f0a824862dca82715e6183497752d57c4442 (diff)
Merge "Mark screen rotation as early (2/2)" into qt-dev
am: a604f0a824 Change-Id: I2104b990656d4884baa69334b3fcb9d4a2d29867
-rw-r--r--libs/gui/SurfaceComposerClient.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/libs/gui/SurfaceComposerClient.cpp b/libs/gui/SurfaceComposerClient.cpp
index d6f88fc7a4..def9fe937c 100644
--- a/libs/gui/SurfaceComposerClient.cpp
+++ b/libs/gui/SurfaceComposerClient.cpp
@@ -365,6 +365,9 @@ SurfaceComposerClient::Transaction& SurfaceComposerClient::Transaction::merge(Tr
mContainsBuffer = other.mContainsBuffer;
other.mContainsBuffer = false;
+ mEarlyWakeup = mEarlyWakeup || other.mEarlyWakeup;
+ other.mEarlyWakeup = false;
+
return *this;
}