Merge "Improve wallpaper debuggability" into main (a4a9bf7a) · Commits · e / os / android_frameworks_base

data/etc/core.protolog.pb

+179 B (53 KiB)

File changed.

No diff preview for this file type.

data/etc/services.core.protolog.json

+44 −2

Original line number	Diff line number	Diff line
		@@ -3421,6 +3421,24 @@
		"group": "WM_DEBUG_WALLPAPER",
		"at": "com\/android\/server\/wm\/WallpaperController.java"
		},
		"-6856158722649737204": {
		"message": "Waiting for offset complete...",
		"level": "VERBOSE",
		"group": "WM_DEBUG_WALLPAPER",
		"at": "com\/android\/server\/wm\/WallpaperController.java"
		},
		"-5966696477376431672": {
		"message": "Offset complete!",
		"level": "VERBOSE",
		"group": "WM_DEBUG_WALLPAPER",
		"at": "com\/android\/server\/wm\/WallpaperController.java"
		},
		"4198834090919802045": {
		"message": "Timeout waiting for wallpaper to offset: %s",
		"level": "VERBOSE",
		"group": "WM_DEBUG_WALLPAPER",
		"at": "com\/android\/server\/wm\/WallpaperController.java"
		},
		"-3477087868568520027": {
		"message": "No longer animating wallpaper targets!",
		"level": "VERBOSE",
		@@ -3451,8 +3469,32 @@
		"group": "WM_DEBUG_WALLPAPER",
		"at": "com\/android\/server\/wm\/WallpaperController.java"
		},
		"-2504764636812266719": {
		"message": "New wallpaper: target=%s prev=%s",
		"7408402065665963407": {
		"message": "Wallpaper at display %d - visibility: %b, keyguardLocked: %b",
		"level": "VERBOSE",
		"group": "WM_DEBUG_WALLPAPER",
		"at": "com\/android\/server\/wm\/WallpaperController.java"
		},
		"-8598497865499265448": {
		"message": "Wallpaper target=%s prev=%s",
		"level": "DEBUG",
		"group": "WM_DEBUG_WALLPAPER",
		"at": "com\/android\/server\/wm\/WallpaperController.java"
		},
		"-5402010429724738603": {
		"message": "Wallpaper should be visible but has not been drawn yet. mWallpaperDrawState=%d",
		"level": "VERBOSE",
		"group": "WM_DEBUG_WALLPAPER",
		"at": "com\/android\/server\/wm\/WallpaperController.java"
		},
		"4151327328872447804": {
		"message": "New home screen wallpaper: %s, prev: %s",
		"level": "DEBUG",
		"group": "WM_DEBUG_WALLPAPER",
		"at": "com\/android\/server\/wm\/WallpaperController.java"
		},
		"6943105284590482059": {
		"message": "New lock\/shared screen wallpaper: %s, prev: %s",
		"level": "DEBUG",
		"group": "WM_DEBUG_WALLPAPER",
		"at": "com\/android\/server\/wm\/WallpaperController.java"

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

+19 −24

Original line number	Diff line number	Diff line
		@@ -336,7 +336,7 @@ class WallpaperController {
		for (int i = mWallpaperTokens.size() - 1; i >= 0; i--) {
		final WallpaperWindowToken token = mWallpaperTokens.get(i);
		token.setVisibility(false);
		if (ProtoLog.isEnabled(WM_DEBUG_WALLPAPER) && token.isVisible()) {
		if (token.isVisible()) {
		ProtoLog.d(WM_DEBUG_WALLPAPER,
		"Hiding wallpaper %s from %s target=%s prev=%s callers=%s",
		token, winGoingAway, mWallpaperTarget, mPrevWallpaperTarget,
		@@ -527,15 +527,15 @@ class WallpaperController {
		if ((mLastWallpaperTimeoutTime + WALLPAPER_TIMEOUT_RECOVERY)
		< start) {
		try {
		if (DEBUG_WALLPAPER) Slog.v(TAG,
		"Waiting for offset complete...");
		ProtoLog.v(WM_DEBUG_WALLPAPER, "Waiting for offset complete...");
		mService.mGlobalLock.wait(WALLPAPER_TIMEOUT);
		} catch (InterruptedException e) {
		}
		if (DEBUG_WALLPAPER) Slog.v(TAG, "Offset complete!");
		ProtoLog.v(WM_DEBUG_WALLPAPER, "Offset complete!");
		if ((start + WALLPAPER_TIMEOUT) < SystemClock.uptimeMillis()) {
		Slog.i(TAG, "Timeout waiting for wallpaper to offset: "
		+ wallpaperWin);
		ProtoLog.v(WM_DEBUG_WALLPAPER,
		"Timeout waiting for wallpaper to offset: %s",
		wallpaperWin);
		mLastWallpaperTimeoutTime = start;
		}
		}
		@@ -891,10 +891,6 @@ class WallpaperController {
		// The window is visible to the compositor...but is it visible to the user?
		// That is what the wallpaper cares about.
		final boolean visible = token != null;
		if (DEBUG_WALLPAPER) {
		Slog.v(TAG, "Wallpaper visibility: " + visible + " at display "
		+ mDisplayContent.getDisplayId());
		}

		if (visible) {
		if (mWallpaperTarget.mWallpaperX >= 0) {
		@@ -915,10 +911,9 @@ class WallpaperController {

		updateWallpaperTokens(visible, mDisplayContent.isKeyguardLocked());

		if (DEBUG_WALLPAPER) {
		Slog.v(TAG, "adjustWallpaperWindows: wallpaper visibility " + visible
		+ ", lock visibility " + mDisplayContent.isKeyguardLocked());
		}
		ProtoLog.v(WM_DEBUG_WALLPAPER,
		"Wallpaper at display %d - visibility: %b, keyguardLocked: %b",
		mDisplayContent.getDisplayId(), visible, mDisplayContent.isKeyguardLocked());

		if (visible && mLastFrozen != mFindResults.isWallpaperTargetForLetterbox) {
		mLastFrozen = mFindResults.isWallpaperTargetForLetterbox;
		@@ -927,7 +922,7 @@ class WallpaperController {
		/* x= / 0, / y= / 0, / z= / 0, / extras= / null, / sync= */ false);
		}

		ProtoLog.d(WM_DEBUG_WALLPAPER, "New wallpaper: target=%s prev=%s",
		ProtoLog.d(WM_DEBUG_WALLPAPER, "Wallpaper target=%s prev=%s",
		mWallpaperTarget, mPrevWallpaperTarget);
		}

		@@ -973,11 +968,9 @@ class WallpaperController {
		WALLPAPER_DRAW_PENDING_TIMEOUT_DURATION);

		}
		if (DEBUG_WALLPAPER) {
		Slog.v(TAG,
		ProtoLog.v(WM_DEBUG_WALLPAPER,
		"Wallpaper should be visible but has not been drawn yet. "
		+ "mWallpaperDrawState=" + mWallpaperDrawState);
		}
		+ "mWallpaperDrawState=%d", mWallpaperDrawState);
		break;
		}
		}
		@@ -1210,15 +1203,17 @@ class WallpaperController {
		boolean isWallpaperTargetForLetterbox = false;

		void setTopHideWhenLockedWallpaper(WindowState win) {
		if (DEBUG_WALLPAPER) {
		Slog.v(TAG, "setTopHideWhenLockedWallpaper " + win);
		if (mTopWallpaper.mTopHideWhenLockedWallpaper != win) {
		ProtoLog.d(WM_DEBUG_WALLPAPER, "New home screen wallpaper: %s, prev: %s",
		win, mTopWallpaper.mTopHideWhenLockedWallpaper);
		}
		mTopWallpaper.mTopHideWhenLockedWallpaper = win;
		}

		void setTopShowWhenLockedWallpaper(WindowState win) {
		if (DEBUG_WALLPAPER) {
		Slog.v(TAG, "setTopShowWhenLockedWallpaper " + win);
		if (mTopWallpaper.mTopShowWhenLockedWallpaper != win) {
		ProtoLog.d(WM_DEBUG_WALLPAPER, "New lock/shared screen wallpaper: %s, prev: %s",
		win, mTopWallpaper.mTopShowWhenLockedWallpaper);
		}
		mTopWallpaper.mTopShowWhenLockedWallpaper = win;
		}