commit f6192868fa4fcf85130ef40a90d0c96fbbca761d
author Wale Ogunwale <ogunwale@google.com> Sat Sep 10 13:42:30 2016 -0700
committer Wale Ogunwale <ogunwale@google.com> Mon Sep 19 10:16:22 2016 -0700
tree 2abf709184e56fa6a81571e87ae113fdff20546d
parent 36110fa1ab564e3bd3e86f3835e1c559ca60cd12

Switched Task to use WindowContainer

Bug: 30060889
Test: Manual testing and existing tests still pass.
Change-Id: Ia56767e47ad3df400e3aa2650f6386cca14659a7

services/core/java/com/android/server/wm/AppWindowToken.java

diff --git a/services/core/java/com/android/server/wm/AppWindowToken.java b/services/core/java/com/android/server/wm/AppWindowToken.java
index bfa02bb..12872dc 100644
--- a/services/core/java/com/android/server/wm/AppWindowToken.java
+++ b/services/core/java/com/android/server/wm/AppWindowToken.java
@@ -76,6 +76,7 @@
 
     final boolean voiceInteraction;
 
+    // TODO: Use getParent instead?
     Task mTask;
     /** @see WindowContainer#fillsParent() */
     private boolean mFillsParent;
@@ -373,7 +374,8 @@
         mIsExiting = false;
         removeAllWindows();
         if (mTask != null) {
-            mTask.detachChild(this);
+            mTask.mStack.mExitingAppTokens.remove(this);
+            mTask.removeChild(this);
         }
     }