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

Commit 4816ed65 authored by Craig Mautner's avatar Craig Mautner Committed by Android (Google) Code Review
Browse files

Merge "Debug for bug 18017409" into lmp-mr1-dev

parents 754bffe9 5a3c231d

services/core/java/com/android/server/am/ActivityStackSupervisor.java

+1 −1
Original line number Diff line number Diff line
@@ -120,7 +120,7 @@ public final class ActivityStackSupervisor implements DisplayListener { 
    static final boolean DEBUG_RELEASE = DEBUG || false;

    static final boolean DEBUG_SAVED_STATE = DEBUG || false;

    static final boolean DEBUG_SCREENSHOTS = DEBUG || false;

    static final boolean DEBUG_STATES = DEBUG || false;

    static final boolean DEBUG_STATES = DEBUG || true;

    static final boolean DEBUG_VISIBLE_BEHIND = DEBUG || false;



    public static final int HOME_STACK_ID = 0;

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

+4 −4
Original line number Diff line number Diff line
@@ -2509,9 +2509,8 @@ public class WindowManagerService extends IWindowManager.Stub 
            }

            mInputMonitor.updateInputWindowsLw(false /*force*/);



            if (localLOGV) Slog.v(

                TAG, "New client " + client.asBinder()

                + ": window=" + win);

            if (true || localLOGV) Slog.v(TAG, "addWindow: New client " + client.asBinder()

                    + ": window=" + win + " Callers=" + Debug.getCallers(5));



            if (win.isVisibleOrAdding() && updateOrientationFromAppTokensLocked(false)) {

                reportNewConfig = true;
@@ -2675,7 +2674,8 @@ public class WindowManagerService extends IWindowManager.Stub 
        mPolicy.removeWindowLw(win);

        win.removeLocked();



        if (DEBUG_ADD_REMOVE) Slog.v(TAG, "removeWindowInnerLocked: " + win);

        if (true || DEBUG_ADD_REMOVE) Slog.v(TAG, "removeWindowInnerLocked: " + win +

                " Callers=" + Debug.getCallers(5));

        mWindowMap.remove(win.mClient.asBinder());

        if (win.mAppOp != AppOpsManager.OP_NONE) {

            mAppOps.finishOp(win.mAppOp, win.getOwningUid(), win.getOwningPackage());