Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 772c5c9c authored by Chris Poultney's avatar Chris Poultney Committed by Automerger Merge Worker
Browse files

Merge "Fixes NPE when running `dumpsys wallpaper`" into udc-dev am: defcfa83 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22529722



Change-Id: I9e90787cf205a2a5d90ea1f2f8f52426a7e3d4a3
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4b4a2292 defcfa83

services/core/java/com/android/server/wallpaper/WallpaperManagerService.java

+1 −0
Original line number Diff line number Diff line
@@ -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);