From 98682a62050d4f4c3f598660b9c397c6bf0b05f0 Mon Sep 17 00:00:00 2001
From: Chris Poultney <poultney@google.com>
Date: Fri, 7 Apr 2023 14:28:50 +0000
Subject: [PATCH] Fixes NPE when running `dumpsys wallpaper`

Bug: 277077910
Test: code compiles, can't test because can't repro failure state
Change-Id: I67adf550cee51273e94b21479fdfaa3f6f252578
---
 .../com/android/server/wallpaper/WallpaperManagerService.java    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java b/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java
index b1b0c559aad48..4a03628ab8e5e 100644
--- 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);