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

This commit is contained in:
Chong Zhang
2016-02-17 01:03:19 +00:00
committed by Android (Google) Code Review
4 changed files with 7 additions and 7 deletions

View File

@@ -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;

View File

@@ -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;
}

View File

@@ -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;

View File

@@ -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;
}