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

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

Merge "Remove AM/WM traces" into nyc-dev

parents 56ea73f2 e05db74f

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

+1 −1
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ class ActivityManagerDebugConfig { 
    static final boolean DEBUG_SERVICE = DEBUG_ALL || false;

    static final boolean DEBUG_SERVICE_EXECUTING = DEBUG_ALL || false;

    static final boolean DEBUG_STACK = DEBUG_ALL || false;

    static final boolean DEBUG_STATES = DEBUG_ALL_ACTIVITIES || true;

    static final boolean DEBUG_STATES = DEBUG_ALL_ACTIVITIES || false;

    static final boolean DEBUG_SWITCH = DEBUG_ALL || false;

    static final boolean DEBUG_TASKS = DEBUG_ALL || false;

    static final boolean DEBUG_THUMBNAILS = DEBUG_ALL || false;

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

+2 −2
Original line number Diff line number Diff line
@@ -1734,8 +1734,8 @@ final class ActivityStack { 


        // This activity is not currently visible, but is running. Tell it to become visible.

        if (r.state == ActivityState.RESUMED || r == starting) {

            Slog.d(TAG_VISIBILITY, "Not making visible, r=" + r + " state=" + r.state

                    + " starting=" + starting);

            if (DEBUG_VISIBILITY) Slog.d(TAG_VISIBILITY,

                    "Not making visible, r=" + r + " state=" + r.state + " starting=" + starting);

            return;

        }

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

+3 −3
Original line number Diff line number Diff line
@@ -37,8 +37,8 @@ public class WindowManagerDebugConfig { 
    static final boolean DEBUG = false;

    static final boolean DEBUG_ADD_REMOVE = false;

    static final boolean DEBUG_FOCUS = false;

    static final boolean DEBUG_FOCUS_LIGHT = DEBUG_FOCUS || true;

    static final boolean DEBUG_ANIM = true;

    static final boolean DEBUG_FOCUS_LIGHT = DEBUG_FOCUS || false;

    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/WindowStateAnimator.java

+1 −1
Original line number Diff line number Diff line
@@ -1347,7 +1347,7 @@ class WindowStateAnimator { 
            }

        } else {

            if (DEBUG_ANIM && isAnimating()) {

                //Slog.v(TAG, "prepareSurface: No changes in animation for " + this);

                Slog.v(TAG, "prepareSurface: No changes in animation for " + this);

            }

            displayed = true;

        }