Merge "Fixed issue with background user window consuming touch events" into mnc-dev (bde85f74) · Commits · e / os / android_frameworks_base

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

+1 −4

Original line number	Diff line number	Diff line
		@@ -10015,7 +10015,7 @@ public class WindowManagerService extends IWindowManager.Stub
		w.mContentChanged = false;

		// Moved from updateWindowsAndWallpaperLocked().
		if (w.mHasSurface && !w.isHiddenFromUserLocked()) {
		if (w.mHasSurface) {
		// Take care of the window being ready to display.
		final boolean committed =
		winAnimator.commitFinishDrawingLocked();
		@@ -10048,10 +10048,7 @@ public class WindowManagerService extends IWindowManager.Stub
		}

		winAnimator.setSurfaceBoundariesLocked(recoveringMemory);
		}

		// Check the draw state of the window, but only if it is visible to the user.
		if (!w.isHiddenFromUserLocked()) {
		final AppWindowToken atoken = w.mAppToken;
		if (DEBUG_STARTING_WINDOW && atoken != null
		&& w == atoken.startingWindow) {

+2 −0

Original line number	Diff line number	Diff line
		@@ -1667,6 +1667,8 @@ class WindowStateAnimator {
		// This must be called while inside a transaction.
		boolean performShowLocked() {
		if (mWin.isHiddenFromUserLocked()) {
		if (DEBUG_VISIBILITY) Slog.w(TAG, "hiding " + mWin + ", belonging to " + mWin.mOwnerUid);
		mWin.hideLw(false);
		return false;
		}
		if (DEBUG_VISIBILITY \|\| (DEBUG_STARTING_WINDOW &&