summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Eric Rahm <erahm@google.com> 2023-09-15 08:31:12 -0700
committer Eric Rahm <erahm@google.com> 2023-09-15 08:55:54 -0700
commit020c3b85c4cb122bb21671a43fb1ba1157f31cc5 (patch)
treed4e7e38becac6cf9c01657dfc8c911116b1c4ea6
parent3c9c6205997cae2fd0394fabd6eef12800ee6625 (diff)
Move verbose wallpaper update log
Only log wallpapr updates when the system or lock wallpaper are actually changing. This reduces a fair amount of logging and makes it easier to debug wallpaper transitions. Bug: 296508731 Test: atest WallpaperManagerTest Change-Id: I73a4516b3db1615ec05cb871f09332f72b436f06
-rw-r--r--services/core/java/com/android/server/wallpaper/WallpaperManagerService.java18
1 files changed, 9 insertions, 9 deletions
diff --git a/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java b/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java
index 3c2d0fcb8cdf..db4f472a0c8b 100644
--- a/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java
+++ b/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java
@@ -256,6 +256,15 @@ public class WallpaperManagerService extends IWallpaperManager.Stub
|| event != CLOSE_WRITE // includes the MOVED_TO case
|| wallpaper.imageWallpaperPending;
+ if (isMigration) {
+ // When separate lock screen engine is supported, migration will be handled by
+ // WallpaperDestinationChangeHandler.
+ return;
+ }
+ if (!(sysWallpaperChanged || lockWallpaperChanged)) {
+ return;
+ }
+
if (DEBUG) {
Slog.v(TAG, "Wallpaper file change: evt=" + event
+ " path=" + path
@@ -270,15 +279,6 @@ public class WallpaperManagerService extends IWallpaperManager.Stub
+ " needsUpdate=" + needsUpdate);
}
- if (isMigration) {
- // When separate lock screen engine is supported, migration will be handled by
- // WallpaperDestinationChangeHandler.
- return;
- }
- if (!(sysWallpaperChanged || lockWallpaperChanged)) {
- return;
- }
-
int notifyColorsWhich = 0;
synchronized (mLock) {
notifyCallbacksLocked(wallpaper);