Merge "Reduce some log spam" into sc-dev (0b095b1e) · Commits · e / os / android_frameworks_base

data/etc/services.core.protolog.json

+12 −6

Original line number	Diff line number	Diff line
		@@ -1177,6 +1177,12 @@
		"group": "WM_DEBUG_REMOTE_ANIMATIONS",
		"at": "com\/android\/server\/wm\/WallpaperAnimationAdapter.java"
		},
		"-760764543": {
		"message": "Focus not requested for window=%s because it has no surface or is not focusable.",
		"level": "VERBOSE",
		"group": "WM_DEBUG_FOCUS_LIGHT",
		"at": "com\/android\/server\/wm\/InputMonitor.java"
		},
		"-754503024": {
		"message": "Relayout %s: oldVis=%d newVis=%d. %s",
		"level": "INFO",
		@@ -1777,6 +1783,12 @@
		"group": "WM_DEBUG_RECENTS_ANIMATIONS",
		"at": "com\/android\/server\/wm\/RecentsAnimation.java"
		},
		"3593205": {
		"message": "commitVisibility: %s: visible=%b mVisibleRequested=%b",
		"level": "VERBOSE",
		"group": "WM_DEBUG_APP_TRANSITIONS",
		"at": "com\/android\/server\/wm\/WallpaperWindowToken.java"
		},
		"9803449": {
		"message": "startFreezingDisplayLocked: exitAnim=%d enterAnim=%d called by %s",
		"level": "DEBUG",
		@@ -1843,12 +1855,6 @@
		"group": "WM_DEBUG_TASKS",
		"at": "com\/android\/server\/wm\/RootWindowContainer.java"
		},
		"63329306": {
		"message": "commitVisibility: %s: visible=%b mVisibleRequested=%b",
		"level": "VERBOSE",
		"group": "WM_DEBUG_WINDOW_TRANSITIONS",
		"at": "com\/android\/server\/wm\/WallpaperWindowToken.java"
		},
		"73987756": {
		"message": "ControlAdapter onAnimationCancelled mSource: %s mControlTarget: %s",
		"level": "INFO",

+2 −2

Original line number	Diff line number	Diff line
		@@ -404,8 +404,8 @@ final class InputMonitor {
		}

		if (!focus.mWinAnimator.hasSurface() \|\| !focus.mInputWindowHandle.isFocusable()) {
		Slog.v(TAG_WM, "Focus not requested for window=%" + focus
		+ " because it has no surface or is not focusable.");
		ProtoLog.v(WM_DEBUG_FOCUS_LIGHT, "Focus not requested for window=%s"
		+ " because it has no surface or is not focusable.", focus);
		mInputFocus = null;
		return;
		}

+2 −2

Original line number	Diff line number	Diff line
		@@ -19,7 +19,7 @@ package com.android.server.wm;
		import static android.app.WindowConfiguration.WINDOWING_MODE_FULLSCREEN;
		import static android.view.WindowManager.LayoutParams.TYPE_WALLPAPER;

		import static com.android.internal.protolog.ProtoLogGroup.WM_DEBUG_WINDOW_TRANSITIONS;
		import static com.android.internal.protolog.ProtoLogGroup.WM_DEBUG_APP_TRANSITIONS;
		import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_WALLPAPER_LIGHT;
		import static com.android.server.wm.WindowManagerDebugConfig.TAG_WITH_CLASS_NAME;
		import static com.android.server.wm.WindowManagerDebugConfig.TAG_WM;
		@@ -177,7 +177,7 @@ class WallpaperWindowToken extends WindowToken {
		void commitVisibility(boolean visible) {
		if (visible == isVisible()) return;

		ProtoLog.v(WM_DEBUG_WINDOW_TRANSITIONS,
		ProtoLog.v(WM_DEBUG_APP_TRANSITIONS,
		"commitVisibility: %s: visible=%b mVisibleRequested=%b", this,
		isVisible(), mVisibleRequested);