Merge "Fixes NPE when running `dumpsys wallpaper`" into udc-dev (defcfa83) · Commits · e / os / android_frameworks_base

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

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -3569,6 +3569,7 @@ public class WallpaperManagerService extends IWallpaperManager.Stub
	private void dumpWallpaper(WallpaperData wallpaper, PrintWriter pw) {		private void dumpWallpaper(WallpaperData wallpaper, PrintWriter pw) {
	if (wallpaper == null) {		if (wallpaper == null) {
	pw.println(" (null entry)");		pw.println(" (null entry)");
			return;
	}		}
	pw.print(" User "); pw.print(wallpaper.userId);		pw.print(" User "); pw.print(wallpaper.userId);
	pw.print(": id="); pw.print(wallpaper.wallpaperId);		pw.print(": id="); pw.print(wallpaper.wallpaperId);