Merge "SurfaceFlinger: Remove reparentChildren" into sc-dev

1 files changed, 0 insertions, 4 deletions

diff --git a/libs/gui/LayerState.cpp b/libs/gui/LayerState.cpp
index 2a9a97ed13..5b213ad5c3 100644
--- a/libs/gui/LayerState.cpp
+++ b/libs/gui/LayerState.cpp
@@ -430,10 +430,6 @@ void layer_state_t::merge(const layer_state_t& other) {
         barrierSurfaceControl_legacy = other.barrierSurfaceControl_legacy;
         barrierFrameNumber = other.barrierFrameNumber;
     }
-    if (other.what & eReparentChildren) {
-        what |= eReparentChildren;
-        reparentSurfaceControl = other.reparentSurfaceControl;
-    }
     if (other.what & eRelativeLayerChanged) {
         what |= eRelativeLayerChanged;
         what &= ~eLayerChanged;