Commit aec55ff5 authored Dec 04, 2017 by chaviw

Ensure non app WindowTokens are removed when closing.

Non app WindowTokens weren't propery removed when closing. This
would cause several layers to stay around in the system.

Bug: 69852584
Test: Turn phone screen off and back on again. Window is removed.
Change-Id: I51674ebdab129b462e958c3027a26ee6feeffb9f

parent e5d74ccc

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

+5 −0

Original line number	Diff line number	Diff line
		@@ -125,6 +125,11 @@ class WindowToken extends WindowContainer<WindowState> {
		}

		void setExiting() {
		if (mChildren.size() == 0) {
		super.removeImmediately();
		return;
		}

		// This token is exiting, so allow it to be removed when it no longer contains any windows.
		mPersistOnEmpty = false;