From 8bda232355de7c1a0cd4b5966638cd8800757d62 Mon Sep 17 00:00:00 2001
From: Louis Chang <louischang@google.com>
Date: Thu, 5 Dec 2019 16:38:11 +0800
Subject: [PATCH] Clean up resources before detaching the task from hierarchy

Bug: 145780344
Test: atest DisplayTests#testNonDefaultDisplayResourcesConfiguration

Change-Id: Ida82f8f6db94b50ac71fe0dea55edc730c5886c8
---
 services/core/java/com/android/server/wm/Task.java | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/services/core/java/com/android/server/wm/Task.java b/services/core/java/com/android/server/wm/Task.java
index 88a38e02de6a6..6e8d0b71353f0 100644
--- a/services/core/java/com/android/server/wm/Task.java
+++ b/services/core/java/com/android/server/wm/Task.java
@@ -968,6 +968,11 @@ class Task extends WindowContainer<WindowContainer> {
         final ActivityStack oldStack = ((ActivityStack) oldParent);
         final ActivityStack newStack = ((ActivityStack) newParent);
 
+        // Task is going to be removed, clean it up before detaching from hierarchy.
+        if (oldParent != null && newParent == null) {
+            cleanUpResourcesForDestroy();
+        }
+
         mStack = newStack;
 
         super.onParentChanged(newParent, oldParent);
@@ -1012,12 +1017,6 @@ class Task extends WindowContainer<WindowContainer> {
             updateOverrideConfigurationFromLaunchBounds();
         }
 
-        // Task is being removed.
-        if (oldParent != null && newParent == null) {
-            cleanUpResourcesForDestroy();
-        }
-
-
         // Update task bounds if needed.
         adjustBoundsForDisplayChangeIfNeeded(getDisplayContent());