summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2019-07-24 01:05:37 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2019-07-24 01:05:37 +0000
commita604f0a824862dca82715e6183497752d57c4442 (patch)
treec62b6ba443c06cb850de0728fa70c4a246cf2bce
parent4658e11cbe1abae691454ddcf93a06763d1bf828 (diff)
parentef4b6013811b15086a6010edb61ac3413184fe5b (diff)
downloadnative-a604f0a824862dca82715e6183497752d57c4442.tar.gz
Merge "Mark screen rotation as early (2/2)" into qt-dev
-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;
}