Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fixed issue with background user window consuming touch events" into mnc-dev

Browse Source
This commit is contained in:
Wale Ogunwale
2015-07-20 18:45:58 +00:00
committed by Android (Google) Code Review
parent 2dcfc7a997 4eef94f2b8
commit bde85f741c
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/core/java/com/android/server/wm/WindowManagerService.java
View File

@@ -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
services/core/java/com/android/server/wm/WindowStateAnimator.java
View File

@@ -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 &&