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

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

Merge "Revert "Remove debugging and skip InputMethod windows"" into lmp-mr1-dev

parents 088bf3a3 ea343e5f

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

+5 −10
Original line number Original line Diff line number Diff line
@@ -473,8 +473,6 @@ public class WindowManagerService extends IWindowManager.Stub 
    boolean mShowingBootMessages = false;

    boolean mShowingBootMessages = false;

    boolean mBootAnimationStopped = false;

    boolean mBootAnimationStopped = false;





    /** Dump of the windows and app tokens at the time of the last ANR. Cleared after

     * LAST_ANR_LIFETIME_DURATION_MSECS */

    String mLastANRState;

    String mLastANRState;





    /** All DisplayContents in the world, kept here */

    /** All DisplayContents in the world, kept here */
@@ -944,7 +942,7 @@ public class WindowManagerService extends IWindowManager.Stub 
    private void placeWindowAfter(WindowState pos, WindowState window) {

    private void placeWindowAfter(WindowState pos, WindowState window) {

        final WindowList windows = pos.getWindowList();

        final WindowList windows = pos.getWindowList();

        final int i = windows.indexOf(pos);

        final int i = windows.indexOf(pos);

        if (DEBUG_FOCUS || DEBUG_WINDOW_MOVEMENT || DEBUG_ADD_REMOVE) Slog.v(

        if (true || DEBUG_FOCUS || DEBUG_WINDOW_MOVEMENT || DEBUG_ADD_REMOVE) Slog.v(

            TAG, "Adding window " + window + " at "

            TAG, "Adding window " + window + " at "

            + (i+1) + " of " + windows.size() + " (after " + pos + ")");

            + (i+1) + " of " + windows.size() + " (after " + pos + ")");

        windows.add(i+1, window);

        windows.add(i+1, window);
@@ -954,7 +952,7 @@ public class WindowManagerService extends IWindowManager.Stub 
    private void placeWindowBefore(WindowState pos, WindowState window) {

    private void placeWindowBefore(WindowState pos, WindowState window) {

        final WindowList windows = pos.getWindowList();

        final WindowList windows = pos.getWindowList();

        int i = windows.indexOf(pos);

        int i = windows.indexOf(pos);

        if (DEBUG_FOCUS || DEBUG_WINDOW_MOVEMENT || DEBUG_ADD_REMOVE) Slog.v(

        if (true || DEBUG_FOCUS || DEBUG_WINDOW_MOVEMENT || DEBUG_ADD_REMOVE) Slog.v(

            TAG, "Adding window " + window + " at "

            TAG, "Adding window " + window + " at "

            + i + " of " + windows.size() + " (before " + pos + ")");

            + i + " of " + windows.size() + " (before " + pos + ")");

        if (i < 0) {

        if (i < 0) {
@@ -1052,7 +1050,7 @@ public class WindowManagerService extends IWindowManager.Stub 
                    //apptoken note that the window could be a floating window

                    //apptoken note that the window could be a floating window

                    //that was created later or a window at the top of the list of

                    //that was created later or a window at the top of the list of

                    //windows associated with this token.

                    //windows associated with this token.

                    if (DEBUG_FOCUS_LIGHT || DEBUG_WINDOW_MOVEMENT || DEBUG_ADD_REMOVE) Slog.v(TAG,

                    if (true || DEBUG_FOCUS_LIGHT || DEBUG_WINDOW_MOVEMENT || DEBUG_ADD_REMOVE) Slog.v(TAG,

                            "not Base app: Adding window " + win + " at " + (newIdx + 1) + " of " +

                            "not Base app: Adding window " + win + " at " + (newIdx + 1) + " of " +

                            N);

                            N);

                    windows.add(newIdx + 1, win);

                    windows.add(newIdx + 1, win);
@@ -1170,14 +1168,11 @@ public class WindowManagerService extends IWindowManager.Stub 
        int i;

        int i;

        for (i = N - 1; i >= 0; --i) {

        for (i = N - 1; i >= 0; --i) {

            WindowState w = windows.get(i);

            WindowState w = windows.get(i);

            if (w.mIsImWindow) {

                continue;

            }

            if (w.mBaseLayer <= myLayer) {

            if (w.mBaseLayer <= myLayer) {

                break;

                break;

            }

            }

        }

        }

        if (DEBUG_FOCUS_LIGHT || DEBUG_WINDOW_MOVEMENT || DEBUG_ADD_REMOVE) Slog.v(TAG,

        if (true || DEBUG_FOCUS_LIGHT || DEBUG_WINDOW_MOVEMENT || DEBUG_ADD_REMOVE) Slog.v(TAG,

                "Based on layer: Adding window " + win + " at " + (i + 1) + " of " + N);

                "Based on layer: Adding window " + win + " at " + (i + 1) + " of " + N);

        windows.add(i + 1, win);

        windows.add(i + 1, win);

        mWindowsChanged = true;

        mWindowsChanged = true;
@@ -3664,7 +3659,7 @@ public class WindowManagerService extends IWindowManager.Stub 
            atoken.layoutConfigChanges = (configChanges &

            atoken.layoutConfigChanges = (configChanges &

                    (ActivityInfo.CONFIG_SCREEN_SIZE | ActivityInfo.CONFIG_ORIENTATION)) != 0;

                    (ActivityInfo.CONFIG_SCREEN_SIZE | ActivityInfo.CONFIG_ORIENTATION)) != 0;

            atoken.mLaunchTaskBehind = launchTaskBehind;

            atoken.mLaunchTaskBehind = launchTaskBehind;

            if (DEBUG_TOKEN_MOVEMENT || DEBUG_ADD_REMOVE) Slog.v(TAG, "addAppToken: " + atoken

            if (true || DEBUG_TOKEN_MOVEMENT || DEBUG_ADD_REMOVE) Slog.v(TAG, "addAppToken: " + atoken

                    + " to stack=" + stackId + " task=" + taskId + " at " + addPos);

                    + " to stack=" + stackId + " task=" + taskId + " at " + addPos);





            Task task = mTaskIdToTask.get(taskId);

            Task task = mTaskIdToTask.get(taskId);