Merge "Fixes NPE when running dumpsys wallpaper" into udc-dev

2023-04-07 19:21:43 +00:00
parent df4ebb5308 98682a6205
commit defcfa838f
1 changed files with 1 additions and 0 deletions
--- a/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java
+++ b/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java
@@ -3569,6 +3569,7 @@ public class WallpaperManagerService extends IWallpaperManager.Stub
    private void dumpWallpaper(WallpaperData wallpaper, PrintWriter pw) {
        if (wallpaper == null) {
            pw.println(" (null entry)");
+            return;
        }
        pw.print(" User "); pw.print(wallpaper.userId);
        pw.print(": id="); pw.print(wallpaper.wallpaperId);