Don't try to register (and invoke!) intentional null callbacks

Change-Id: Iccb9df242a4d6c3aea03be9132f83afb70be0397
2016-02-18 18:39:19 -08:00
parent f491051143
commit ea6724a3c3
1 changed files with 3 additions and 1 deletions
--- 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;
                }