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

Commit 27a0b7f2 authored by Chris Tate's avatar Chris Tate Committed by android-build-merger
Browse files

Merge "Don\'t try to register (and invoke!) intentional null callbacks" into nyc-dev 

am: e7cc1ace

* commit 'e7cc1ace':
  Don't try to register (and invoke!) intentional null callbacks
parents 887f7c0f e7cc1ace

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

+3 −1
Original line number Diff line number Diff line
@@ -1105,7 +1105,9 @@ public class WallpaperManagerService extends IWallpaperManager.Stub { 
                    outParams.putInt("width", wallpaper.width);

                    outParams.putInt("height", wallpaper.height);

                }

                if (cb != null) {

                    wallpaper.callbacks.register(cb);

                }

                if (!wallpaper.cropFile.exists()) {

                    return null;

                }