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

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

Merge "Fixes improbable NPE in WallpaperManagerService dump()" into udc-dev... 

Merge "Fixes improbable NPE in WallpaperManagerService dump()" into udc-dev am: 9e5276fa am: d387b2bb

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



Change-Id: I9ce60e3f622497a83e9c1802eb183f9e105d5db9
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents fa7908d7 d387b2bb

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

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