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

Merge "Track added/removed window when focus is null" into oc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2017-06-02 17:58:04 +00:00
committed by Android (Google) Code Review
parent 12ee4bd7a8 2c9f203aad
commit e8f39b53d4
2 changed files with 24 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/wm/Task.java
View File

@@ -163,6 +163,8 @@ class Task extends WindowContainer<AppWindowToken> implements DimLayer.DimLayerU
@VisibleForTesting @VisibleForTesting
boolean shouldDeferRemoval() { boolean shouldDeferRemoval() {
// TODO: This should probably return false if mChildren.isEmpty() regardless if the stack
// is animating...
return hasWindowsAlive() && mStack.isAnimating(); return hasWindowsAlive() && mStack.isAnimating();
} }

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

@@ -617,6 +617,11 @@ public class WindowManagerService extends IWindowManager.Stub
WindowState mCurrentFocus = null; WindowState mCurrentFocus = null;
WindowState mLastFocus = null; WindowState mLastFocus = null;
/** Windows added since {@link #mCurrentFocus} was set to null. Used for ANR blaming. */
private final ArrayList<WindowState> mWinAddedSinceNullFocus = new ArrayList<>();
/** Windows removed since {@link #mCurrentFocus} was set to null. Used for ANR blaming. */
private final ArrayList<WindowState> mWinRemovedSinceNullFocus = new ArrayList<>();
/** This just indicates the window the input method is on top of, not /** This just indicates the window the input method is on top of, not
* necessarily the window its input is going to. */ * necessarily the window its input is going to. */
WindowState mInputMethodTarget = null; WindowState mInputMethodTarget = null;
@@ -1381,6 +1386,9 @@ public class WindowManagerService extends IWindowManager.Stub
// From now on, no exceptions or errors allowed! // From now on, no exceptions or errors allowed!
res = WindowManagerGlobal.ADD_OKAY; res = WindowManagerGlobal.ADD_OKAY;
if (mCurrentFocus == null) {
mWinAddedSinceNullFocus.add(win);
}
if (excludeWindowTypeFromTapOutTask(type)) { if (excludeWindowTypeFromTapOutTask(type)) {
displayContent.mTapExcludedWindows.add(win); displayContent.mTapExcludedWindows.add(win);
@@ -1667,6 +1675,9 @@ public class WindowManagerService extends IWindowManager.Stub
mAppOps.finishOp(win.mAppOp, win.getOwningUid(), win.getOwningPackage()); mAppOps.finishOp(win.mAppOp, win.getOwningUid(), win.getOwningPackage());
} }
if (mCurrentFocus == null) {
mWinRemovedSinceNullFocus.add(win);
}
mPendingRemove.remove(win); mPendingRemove.remove(win);
mResizingWindows.remove(win); mResizingWindows.remove(win);
mWindowsChanged = true; mWindowsChanged = true;
@@ -5804,6 +5815,11 @@ public class WindowManagerService extends IWindowManager.Stub
mCurrentFocus = newFocus; mCurrentFocus = newFocus;
mLosingFocus.remove(newFocus); mLosingFocus.remove(newFocus);
if (mCurrentFocus != null) {
mWinAddedSinceNullFocus.clear();
mWinRemovedSinceNullFocus.clear();
}
int focusChanged = mPolicy.focusChangedLw(oldFocus, newFocus); int focusChanged = mPolicy.focusChangedLw(oldFocus, newFocus);
if (imWindowChanged && oldFocus != mInputMethodWindow) { if (imWindowChanged && oldFocus != mInputMethodWindow) {
@@ -6538,6 +6554,12 @@ public class WindowManagerService extends IWindowManager.Stub
if (reason != null) { if (reason != null) {
pw.println(" Reason: " + reason); pw.println(" Reason: " + reason);
} }
if (!mWinAddedSinceNullFocus.isEmpty()) {
pw.println(" Windows added since null focus: " + mWinAddedSinceNullFocus);
}
if (!mWinRemovedSinceNullFocus.isEmpty()) {
pw.println(" Windows removed since null focus: " + mWinRemovedSinceNullFocus);
}
pw.println(); pw.println();
dumpWindowsNoHeaderLocked(pw, true, null); dumpWindowsNoHeaderLocked(pw, true, null);
pw.println(); pw.println();