Merge "Fix windows not showing when SHOW_WHEN_LOCKED changes" into lmp-dev (d4e632bb) · Commits · e / os / android_frameworks_base

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

+3 −4

Original line number	Diff line number	Diff line
		@@ -248,7 +248,7 @@ public class WindowAnimator {
		for (int i = windows.size() - 1; i >= 0; i--) {
		WindowState win = windows.get(i);
		WindowStateAnimator winAnimator = win.mWinAnimator;
		final int flags = winAnimator.mAttrFlags;
		final int flags = win.mAttrs.flags;

		if (winAnimator.mSurfaceControl != null) {
		final boolean wasAnimating = winAnimator.mWasAnimating;
		@@ -309,8 +309,7 @@ public class WindowAnimator {
		+ " hidden=" + win.mRootToken.hidden
		+ " anim=" + win.mWinAnimator.mAnimation);
		} else if (mPolicy.canBeForceHidden(win, win.mAttrs)) {
		final boolean hideWhenLocked =
		(winAnimator.mAttrFlags & FLAG_SHOW_WHEN_LOCKED) == 0;
		final boolean hideWhenLocked = (flags & FLAG_SHOW_WHEN_LOCKED) == 0;
		final boolean changed;
		if (((mForceHiding == KEYGUARD_ANIMATING_IN)
		&& (!winAnimator.isAnimating() \|\| hideWhenLocked))
		@@ -416,7 +415,7 @@ public class WindowAnimator {
		continue;
		}

		final int flags = winAnimator.mAttrFlags;
		final int flags = win.mAttrs.flags;

		// If this window is animating, make a note that we have
		// an animating window and take care of a request to run

+0 −2

Original line number	Diff line number	Diff line
		@@ -172,7 +172,6 @@ class WindowStateAnimator {
		/** Was this window last hidden? */
		boolean mLastHidden;

		int mAttrFlags;
		int mAttrType;

		public WindowStateAnimator(final WindowState win) {
		@@ -197,7 +196,6 @@ class WindowStateAnimator {
		? null : win.mAttachedWindow.mWinAnimator;
		mAppAnimator = win.mAppToken == null ? null : win.mAppToken.mAppAnimator;
		mSession = win.mSession;
		mAttrFlags = win.mAttrs.flags;
		mAttrType = win.mAttrs.type;
		mIsWallpaper = win.mIsWallpaper;
		}