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

Commit 759d34cb authored by Craig Mautner's avatar Craig Mautner Committed by Android Git Automerger
Browse files

am 316e369c: am 30bd3bb7: Revert "Debug for bug 18017409" 

* commit '316e369c':
  Revert "Debug for bug 18017409"
parents a28bd7a0 316e369c

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

+1 −1
Original line number Diff line number Diff line
@@ -121,7 +121,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 || true;

    static final boolean DEBUG_STATES = DEBUG || false;

    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

+2 −3
Original line number Diff line number Diff line
@@ -2541,7 +2541,7 @@ public class WindowManagerService extends IWindowManager.Stub 
            }

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



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

            if (localLOGV || DEBUG_ADD_REMOVE) Slog.v(TAG, "addWindow: New client "

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



            if (win.isVisibleOrAdding() && updateOrientationFromAppTokensLocked(false)) {
@@ -2706,8 +2706,7 @@ public class WindowManagerService extends IWindowManager.Stub 
        mPolicy.removeWindowLw(win);

        win.removeLocked();



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

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

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

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

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

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