Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2c9f203a authored by Wale Ogunwale's avatar Wale Ogunwale
Browse files

Track added/removed window when focus is null 

Improves the blaming of ANRs by determining if an app added windows
after it was launched.

Bug: 38121026
Test: Log inspection
Change-Id: Id86c1981150cf546c92d786ad45d5c2dda5573e0
parent 1ac325e4

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

+2 −0
Original line number Diff line number Diff line
@@ -163,6 +163,8 @@ class Task extends WindowContainer<AppWindowToken> implements DimLayer.DimLayerU 


    @VisibleForTesting

    boolean shouldDeferRemoval() {

        // TODO: This should probably return false if mChildren.isEmpty() regardless if the stack

        // is animating...

        return hasWindowsAlive() && mStack.isAnimating();

    }

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

+22 −0
Original line number Diff line number Diff line
@@ -617,6 +617,11 @@ public class WindowManagerService extends IWindowManager.Stub 
    WindowState mCurrentFocus = 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

     * necessarily the window its input is going to. */

    WindowState mInputMethodTarget = null;
@@ -1381,6 +1386,9 @@ public class WindowManagerService extends IWindowManager.Stub 
            // From now on, no exceptions or errors allowed!



            res = WindowManagerGlobal.ADD_OKAY;

            if (mCurrentFocus == null) {

                mWinAddedSinceNullFocus.add(win);

            }



            if (excludeWindowTypeFromTapOutTask(type)) {

                displayContent.mTapExcludedWindows.add(win);
@@ -1667,6 +1675,9 @@ public class WindowManagerService extends IWindowManager.Stub 
            mAppOps.finishOp(win.mAppOp, win.getOwningUid(), win.getOwningPackage());

        }



        if (mCurrentFocus == null) {

            mWinRemovedSinceNullFocus.add(win);

        }

        mPendingRemove.remove(win);

        mResizingWindows.remove(win);

        mWindowsChanged = true;
@@ -5804,6 +5815,11 @@ public class WindowManagerService extends IWindowManager.Stub 
            mCurrentFocus = newFocus;

            mLosingFocus.remove(newFocus);



            if (mCurrentFocus != null) {

                mWinAddedSinceNullFocus.clear();

                mWinRemovedSinceNullFocus.clear();

            }



            int focusChanged = mPolicy.focusChangedLw(oldFocus, newFocus);



            if (imWindowChanged && oldFocus != mInputMethodWindow) {
@@ -6538,6 +6554,12 @@ public class WindowManagerService extends IWindowManager.Stub 
        if (reason != null) {

            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();

        dumpWindowsNoHeaderLocked(pw, true, null);

        pw.println();