commit 996bc421ea90965e384c947f5a68394afb95bd88
author Vishnu Nair <vishnun@google.com> Tue Jul 16 14:15:33 2019 -0700
committer Vishnu Nair <vishnun@google.com> Tue Jul 16 14:15:33 2019 -0700
tree b78cf2c9e96ef4b89a2e8d4a7f98cd0d39eccf1b
parent f9f627bf75a0507d760997d417c0b9d9ae2d5a7f

Properly merge flags when merging transactions

Test: atest SurfaceFlinger_test

Change-Id: Ib1446c5afe00fd2588f7682f33cbbc6d6eb6a1ea

libs/gui/LayerState.cpp

diff --git a/libs/gui/LayerState.cpp b/libs/gui/LayerState.cpp
index 6066421..aa07cbe 100644
--- a/libs/gui/LayerState.cpp
+++ b/libs/gui/LayerState.cpp
@@ -267,8 +267,9 @@
     }
     if (other.what & eFlagsChanged) {
         what |= eFlagsChanged;
-        flags = other.flags;
-        mask = other.mask;
+        flags &= ~other.mask;
+        flags |= (other.flags & other.mask);
+        mask |= other.mask;
     }
     if (other.what & eLayerStackChanged) {
         what |= eLayerStackChanged;