Merge "Integer to int causes null exception" into sc-dev

2021-04-02 04:00:11 +00:00
parent 2aca029981 48191afa57
commit 56d150ed18
1 changed files with 2 additions and 1 deletions
--- a/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java
+++ b/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java
@@ -1300,8 +1300,9 @@ public class WallpaperManagerService extends IWallpaperManager.Stub
                    if (callbacks == null) return;
                    callbacks.broadcast(c -> {
                        try {
-                            int targetDisplayId =
+                            Integer targetDisplayId =
                                    callbackDisplayIds.get(c.asBinder());
+                            if (targetDisplayId == null) return;
                            if (targetDisplayId == displayId) c.onColorsChanged(area, colors);
                        } catch (RemoteException e) {
                            e.printStackTrace();