summaryrefslogtreecommitdiff
path: root/libs/gui/LayerState.cpp
diff options
context:
space:
mode:
author Robert Carr <racarr@google.com> 2021-04-08 17:30:52 -0700
committer Robert Carr <racarr@google.com> 2021-04-08 17:32:19 -0700
commit257fdaecb53fdec10dbe187ec523641da21b55cb (patch)
treed8b2ebe397742d8ea8f32a728dba57fa6bfc71ec /libs/gui/LayerState.cpp
parent9432a357af0f0ff4a83d1f9db646450cf162d616 (diff)
SurfaceFlinger: Remove reparentChildren
No callers left outside of tests. Bug: 161937501 Test: Existing tests pass Change-Id: Id5c2b68d1be05fce9f698813d83044b02bb2764d
Diffstat (limited to 'libs/gui/LayerState.cpp')
-rw-r--r--libs/gui/LayerState.cpp4
1 files changed, 0 insertions, 4 deletions
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;