From 9f55e87f0930584381185cf111d8f47a11c023c5 Mon Sep 17 00:00:00 2001
From: Chris Poultney <poultney@google.com>
Date: Mon, 20 Mar 2023 20:43:29 +0000
Subject: [PATCH] Fixes improbable NPE in WallpaperManagerService dump()

Bug: 274492913
Test: manually verified that dump works with dumpsys
Change-Id: If85bf8051aa95d3e65035ea46d8720ad5e6cc920
---
 .../com/android/server/wallpaper/WallpaperManagerService.java  | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java b/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java
index 55060a677c8cf..f53b52c18e145 100644
--- a/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java
+++ b/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java
@@ -3560,6 +3560,9 @@ public class WallpaperManagerService extends IWallpaperManager.Stub
     }
 
     private void dumpWallpaper(WallpaperData wallpaper, PrintWriter pw) {
+        if (wallpaper == null) {
+            pw.println(" (null entry)");
+        }
         pw.print(" User "); pw.print(wallpaper.userId);
         pw.print(": id="); pw.print(wallpaper.wallpaperId);
         pw.print(": mWhich="); pw.print(wallpaper.mWhich);