Merge "Fix stack reference is not updated when task organizer is dead." into rvc-dev (70511db9) · Commits · e / os / android_frameworks_base

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -1423,7 +1423,7 @@ class Task extends WindowContainer<WindowContainer> {
		void removeChild(WindowContainer r, String reason) {
		// A rootable child task that is now being removed from an organized task. Making sure
		// the stack references is keep updated.
		if (mTaskOrganizer != null && mCreatedByOrganizer && r.asTask() != null) {
		if (mCreatedByOrganizer && r.asTask() != null) {
		getDisplayArea().removeStackReferenceIfNeeded((ActivityStack) r);
		}
		if (!mChildren.contains(r)) {