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

Commit 9ea8bf15 authored by Craig Mautner's avatar Craig Mautner Committed by Android Git Automerger
Browse files

am 7908f190: Merge "Debug for b/10689184." into klp-dev 

* commit '7908f190':
  Debug for b/10689184.
parents a13e5dd3 7908f190

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

+1 −1
Original line number Diff line number Diff line
@@ -88,7 +88,7 @@ public final class ActivityStackSupervisor { 
    static final boolean DEBUG_ADD_REMOVE = DEBUG || false;

    static final boolean DEBUG_APP = DEBUG || false;

    static final boolean DEBUG_SAVED_STATE = DEBUG || false;

    static final boolean DEBUG_STATES = DEBUG || false;

    static final boolean DEBUG_STATES = DEBUG || true;

    static final boolean DEBUG_IDLE = DEBUG || false;



    public static final int HOME_STACK_ID = 0;

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

+3 −4
Original line number Diff line number Diff line
@@ -158,7 +158,7 @@ public class WindowManagerService extends IWindowManager.Stub 
                DisplayManagerService.WindowManagerFuncs, DisplayManager.DisplayListener {

    static final String TAG = "WindowManager";

    static final boolean DEBUG = false;

    static final boolean DEBUG_ADD_REMOVE = false;

    static final boolean DEBUG_ADD_REMOVE = true;

    static final boolean DEBUG_FOCUS = false;

    static final boolean DEBUG_FOCUS_LIGHT = DEBUG_FOCUS || false;

    static final boolean DEBUG_ANIM = false;
@@ -4764,7 +4764,6 @@ public class WindowManagerService extends IWindowManager.Stub 
            synchronized(mWindowMap) {

                Task task = mTaskIdToTask.get(taskId);

                if (task == null) {

                    Slog.e(TAG, "moveTaskToTop: taskId=" + taskId + " not found in mTaskIdToTask");

                    return;

                }

                final TaskStack stack = task.mStack;
@@ -9711,8 +9710,8 @@ public class WindowManagerService extends IWindowManager.Stub 
                newFocus = computeFocusedWindowLocked();

            }



            if (DEBUG_FOCUS_LIGHT || localLOGV) Slog.v(

                TAG, "Changing focus from " + mCurrentFocus + " to " + newFocus);

            if (true || DEBUG_FOCUS_LIGHT || localLOGV) Slog.v(TAG, "Changing focus from " +

                    mCurrentFocus + " to " + newFocus + " Callers=" + Debug.getCallers(4));

            final WindowState oldFocus = mCurrentFocus;

            mCurrentFocus = newFocus;

            mLosingFocus.remove(newFocus);