commit 56d150ed1862017bd30590f4c4fd80ad64c1b317
author TreeHugger Robot <treehugger-gerrit@google.com> Fri Apr 02 04:00:11 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Apr 02 04:00:11 2021 +0000
tree cb859a22fca166c80a404c650d0cbb8306a7bf78
parent 2aca02998146f76d2892075835ecd47e7faebc37
parent 48191afa5731dd8b3dcdcbe9dab426f5a16c6b19

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

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

diff --git a/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java b/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java
index 9dc68f2..89b7bbd 100644
--- a/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java
+++ b/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java
@@ -1300,8 +1300,9 @@
                     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();