commit 761f8b4a54871ba1de4b6fca0bd35d453f67ad11
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Nov 29 20:01:36 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Nov 29 20:01:36 2017 +0000
tree 4ca9602be3670edca32326bdac3aed045a4e074e
parent e3c88c6a5c33d87ea7db493d735acb213ea39e2d
parent 8ea97bbe9b5097feaa76926c6ac49120e0fc3649

Merge "Remove from top layer list if re-parenting top layer."

services/surfaceflinger/SurfaceFlinger.cpp

diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index 4acd448..59ac0ec 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -3224,7 +3224,11 @@
         // changed, we don't want this to cause any more work
     }
     if (what & layer_state_t::eReparent) {
+        bool hadParent = layer->hasParent();
         if (layer->reparent(s.parentHandleForChild)) {
+            if (!hadParent) {
+                mCurrentState.layersSortedByZ.remove(layer);
+            }
             flags |= eTransactionNeeded|eTraversalNeeded;
         }
     }