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

Commit 66392886 authored by Chong Zhang's avatar Chong Zhang Committed by Android (Google) Code Review
Browse files

Merge "Disable WM loggings"

parents 92c29360 0464a934

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

+3 −3
Original line number Diff line number Diff line
@@ -35,10 +35,10 @@ public class WindowManagerDebugConfig { 


    static final boolean DEBUG_RESIZE = false;

    static final boolean DEBUG = false;

    static final boolean DEBUG_ADD_REMOVE = true;

    static final boolean DEBUG_ADD_REMOVE = false;

    static final boolean DEBUG_FOCUS = false;

    static final boolean DEBUG_FOCUS_LIGHT = DEBUG_FOCUS || false;

    static final boolean DEBUG_ANIM = true;

    static final boolean DEBUG_ANIM = false;

    static final boolean DEBUG_KEYGUARD = false;

    static final boolean DEBUG_LAYOUT = false;

    static final boolean DEBUG_LAYERS = false;
@@ -50,7 +50,7 @@ public class WindowManagerDebugConfig { 
    static final boolean DEBUG_ORIENTATION = false;

    static final boolean DEBUG_APP_ORIENTATION = false;

    static final boolean DEBUG_CONFIGURATION = false;

    static final boolean DEBUG_APP_TRANSITIONS = true;

    static final boolean DEBUG_APP_TRANSITIONS = false;

    static final boolean DEBUG_STARTING_WINDOW = false;

    static final boolean DEBUG_WALLPAPER = false;

    static final boolean DEBUG_WALLPAPER_LIGHT = false || DEBUG_WALLPAPER;

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

+3 −0
Original line number Diff line number Diff line
@@ -2856,6 +2856,9 @@ public class WindowManagerService extends IWindowManager.Stub 
            WindowStateAnimator winAnimator, int attrChanges, int oldVisibility) {

        result |= !win.isVisibleLw() ? WindowManagerGlobal.RELAYOUT_RES_FIRST_TIME : 0;

        if (win.mExiting) {

            Slog.d(TAG, "relayoutVisibleWindow: " + win + " mExiting=true, mRemoveOnExit="

                    + win.mRemoveOnExit + ", mDestroying=" + win.mDestroying);



            winAnimator.cancelExitAnimationForNextAnimationLocked();

            win.mExiting = false;

        }

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

+2 −1
Original line number Diff line number Diff line
@@ -572,7 +572,8 @@ class WindowStateAnimator { 
    WindowSurfaceController createSurfaceLocked() {

        final WindowState w = mWin;

        if (w.hasSavedSurface()) {

            Slog.i(TAG, "***** createSurface: " + this + ": called when we had a saved surface");

            if (DEBUG_ANIM) Slog.i(TAG,

                    "createSurface: " + this + ": called when we had a saved surface");

            w.restoreSavedSurface();

            return mSurfaceController;

        }

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

+1 −1
Original line number Diff line number Diff line
@@ -130,7 +130,7 @@ class WindowSurfaceController { 


    void destroyInTransaction() {

        //        if (SHOW_TRANSACTIONS || SHOW_SURFACE_ALLOC) {

        Slog.i(TAG, "Destroying surface " + this + " called by " + Debug.getCallers(3));

        Slog.i(TAG, "Destroying surface " + this + " called by " + Debug.getCallers(4));

        //        }

        try {

            mSurfaceControl.destroy();