From 8ba8b076a0335155a57a9e8004614c302d07c154 Mon Sep 17 00:00:00 2001
From: chaviw <chaviw@google.com>
Date: Mon, 25 Jan 2021 14:55:46 -0800
Subject: Remove detachChildren

Since there are no longer callers of detachChildren, remove code and
test that involve detachChildren

Test: Builds and remaining tests pass
Bug: 177557720
Change-Id: Id5b7120b7f2c289d4e7ffb5565b29e2be18d6587
---
 libs/gui/LayerState.cpp | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'libs/gui/LayerState.cpp')

diff --git a/libs/gui/LayerState.cpp b/libs/gui/LayerState.cpp
index 63be3edf94..e1aba42911 100644
--- a/libs/gui/LayerState.cpp
+++ b/libs/gui/LayerState.cpp
@@ -427,9 +427,6 @@ void layer_state_t::merge(const layer_state_t& other) {
         what |= eReparentChildren;
         reparentSurfaceControl = other.reparentSurfaceControl;
     }
-    if (other.what & eDetachChildren) {
-        what |= eDetachChildren;
-    }
     if (other.what & eRelativeLayerChanged) {
         what |= eRelativeLayerChanged;
         what &= ~eLayerChanged;
-- 
cgit v1.2.3-59-g8ed1b