From ea6724a3c3b8917d51d32ebf4fe0eb69828b7054 Mon Sep 17 00:00:00 2001
From: Christopher Tate <ctate@google.com>
Date: Thu, 18 Feb 2016 18:39:19 -0800
Subject: Don't try to register (and invoke!) intentional null callbacks

Change-Id: Iccb9df242a4d6c3aea03be9132f83afb70be0397
---
 .../java/com/android/server/wallpaper/WallpaperManagerService.java    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java b/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java
index 7387f020968d..a16c8d1b1fd4 100644
--- a/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java
+++ b/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java
@@ -1105,7 +1105,9 @@ public class WallpaperManagerService extends IWallpaperManager.Stub {
                     outParams.putInt("width", wallpaper.width);
                     outParams.putInt("height", wallpaper.height);
                 }
-                wallpaper.callbacks.register(cb);
+                if (cb != null) {
+                    wallpaper.callbacks.register(cb);
+                }
                 if (!wallpaper.cropFile.exists()) {
                     return null;
                 }
-- 
cgit v1.2.3-59-g8ed1b