From 48191afa5731dd8b3dcdcbe9dab426f5a16c6b19 Mon Sep 17 00:00:00 2001
From: Jay Aliomer <aaliomer@google.com>
Date: Thu, 1 Apr 2021 22:26:54 -0400
Subject: [PATCH] Integer to int causes null exception

Fixes: b/183921888
Test: manually follow bug steps
Change-Id: I7763f4108ced922eba031b5b405774bfe112549a
---
 .../com/android/server/wallpaper/WallpaperManagerService.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java b/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java
index 9dc68f28ab8e4..89b7bbd450721 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 @@ 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();