| commit | 6cabc2a4edf74d132ad66c21189ee7d0e7886dd7 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Thu Jul 25 23:41:32 2019 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Jul 25 23:41:32 2019 +0000 |
| tree | 2f4a39df0e40338d971f6cee7b3393f057aa5e87 | |
| parent | d717a27ba4dab5eabd0d20ab81bd60c1b4c0f80f [diff] | |
| parent | 44685cb3f0e53c0f0b5f260891b9dd78d25410d4 [diff] |
Merge "Merge damage region when dropping an app buffer" into qt-r1-dev
diff --git a/libs/gui/SurfaceComposerClient.cpp b/libs/gui/SurfaceComposerClient.cpp index d6f88fc..def9fe9 100644 --- a/libs/gui/SurfaceComposerClient.cpp +++ b/libs/gui/SurfaceComposerClient.cpp
@@ -365,6 +365,9 @@ mContainsBuffer = other.mContainsBuffer; other.mContainsBuffer = false; + mEarlyWakeup = mEarlyWakeup || other.mEarlyWakeup; + other.mEarlyWakeup = false; + return *this; }