From 6e312b9b711b9e36e0772cd55dd391455b130b7e Mon Sep 17 00:00:00 2001
From: Marzia Favaro <marziana@google.com>
Date: Tue, 28 Feb 2023 14:31:09 +0000
Subject: [PATCH] Prevent crash if detachWallpaperLocked is called multiple
 times

Test: no, minor change
Bug: 242851438
Change-Id: I22b6e60ff4047fcb78624acbb1e30d84bca7df3d
---
 .../com/android/server/wallpaper/WallpaperManagerService.java | 4 +++-
 1 file changed, 3 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 ac03808deba1f..7a733592b30c1 100644
--- a/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java
+++ b/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java
@@ -945,7 +945,9 @@ public class WallpaperManagerService extends IWallpaperManager.Stub
             mWindowManagerInternal.removeWindowToken(mToken, false/* removeWindows */,
                     mDisplayId);
             try {
-                connection.mService.detach(mToken);
+                if (connection.mService != null) {
+                    connection.mService.detach(mToken);
+                }
             } catch (RemoteException e) {
                 Slog.w(TAG, "connection.mService.destroy() threw a RemoteException");
             }