From c206441b0645080e9dc1411acaabfe2654b4b320 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aur=C3=A9lien=20Pomini?= <pomini@google.com>
Date: Fri, 5 May 2023 12:19:30 +0000
Subject: [PATCH] Fix WallpaperManagerInternal NPE
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Some targets don't have a WallpaperManager, thus this null check is
necessary to avoid crashes. A crash was detected in Android auto
emulator.

Fixes: 280883891
Test: build completed successfully
Change-Id: Ie475e9ba1999f109572252303e4103e5f977b4bd
---
 .../com/android/server/wm/ActivityTaskManagerService.java    | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/wm/ActivityTaskManagerService.java b/services/core/java/com/android/server/wm/ActivityTaskManagerService.java
index 0b572dfea3e36..f35343c987117 100644
--- a/services/core/java/com/android/server/wm/ActivityTaskManagerService.java
+++ b/services/core/java/com/android/server/wm/ActivityTaskManagerService.java
@@ -3555,7 +3555,10 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub {
                 mRootWindowContainer.forAllDisplays(displayContent -> {
                     mKeyguardController.keyguardGoingAway(displayContent.getDisplayId(), flags);
                 });
-                getWallpaperManagerInternal().onKeyguardGoingAway();
+                WallpaperManagerInternal wallpaperManagerInternal = getWallpaperManagerInternal();
+                if (wallpaperManagerInternal != null) {
+                    wallpaperManagerInternal.onKeyguardGoingAway();
+                }
             }
         } finally {
             Binder.restoreCallingIdentity(token);