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

Commit c145b537 authored by Olawale Ogunwale's avatar Olawale Ogunwale
Browse files

Revert "Revert "Remove debugging and skip InputMethod windows"" 

This reverts commit ea343e5f.
Reducing log spam from WM.

Change-Id: I56468a61b15d08eff1d89b0d648f29a0e868408c
parent d0699fa5

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

+7 −5
Original line number Diff line number Diff line
@@ -466,6 +466,8 @@ public class WindowManagerService extends IWindowManager.Stub 
    boolean mShowingBootMessages = 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;



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

        final WindowList windows = pos.getWindowList();

        final int i = windows.indexOf(pos);

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

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

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

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

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

        final WindowList windows = pos.getWindowList();

        int i = windows.indexOf(pos);

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

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

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

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

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

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

                    //windows associated with this token.

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

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

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

                            N);

                    windows.add(newIdx + 1, win);
@@ -1255,7 +1257,7 @@ public class WindowManagerService extends IWindowManager.Stub 
                break;

            }

        }

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

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

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

        windows.add(i + 1, win);

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

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

            atoken.mLaunchTaskBehind = launchTaskBehind;

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

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

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



            Task task = mTaskIdToTask.get(taskId);