diff options
| author | 2019-07-23 18:34:06 -0700 | |
|---|---|---|
| committer | 2019-07-23 18:34:06 -0700 | |
| commit | 901b8d9937f30b28a7c0d1b40daae5f489666c0b (patch) | |
| tree | 3b43a2b866df75e52183b774547aecd0f6d06c21 | |
| parent | d857bf57e1c54d21fea4692801fb6c3144d1aa00 (diff) | |
| parent | a604f0a824862dca82715e6183497752d57c4442 (diff) | |
Merge "Mark screen rotation as early (2/2)" into qt-dev
am: a604f0a824
Change-Id: Ifae71714511bd352608d08537b3701c62827dede
| -rw-r--r-- | libs/gui/SurfaceComposerClient.cpp | 3 |
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; } |