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

Commit e7cc1ace authored by Chris Tate's avatar Chris Tate Committed by Android (Google) Code Review
Browse files

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

parents 116d872d ea6724a3

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;

                }