Merge "Fix leak of decor view children." (b9f13b02) · Commits · e / os / android_frameworks_base

core/java/com/android/internal/policy/PhoneWindow.java

+8 −2

Original line number	Diff line number	Diff line
		@@ -488,9 +488,15 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback {
		}

		public void clearContentView() {
		if (mNonClientDecorView != null && mNonClientDecorView.getChildCount() > 1) {
		if (mNonClientDecorView != null) {
		if (mNonClientDecorView.getChildCount() > 1) {
		mNonClientDecorView.removeViewAt(1);
		}
		} else {
		// This window doesn't have non client decor, so we need to just remove the children
		// of the decor view.
		mDecor.removeAllViews();
		}
		}

		private void transitionTo(Scene scene) {