From 257fdaecb53fdec10dbe187ec523641da21b55cb Mon Sep 17 00:00:00 2001 From: Robert Carr Date: Thu, 8 Apr 2021 17:30:52 -0700 Subject: SurfaceFlinger: Remove reparentChildren No callers left outside of tests. Bug: 161937501 Test: Existing tests pass Change-Id: Id5c2b68d1be05fce9f698813d83044b02bb2764d --- libs/gui/LayerState.cpp | 4 ---- 1 file changed, 4 deletions(-) (limited to 'libs/gui/LayerState.cpp') diff --git a/libs/gui/LayerState.cpp b/libs/gui/LayerState.cpp index 0ca497795b..809438534c 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; -- cgit v1.2.3-59-g8ed1b