From 6122f0ed1ec662067d83f0bf2b2ab6ac299ab63a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aur=C3=A9lien=20Pomini?= <pomini@google.com>
Date: Mon, 15 May 2023 16:20:21 +0000
Subject: [PATCH] Fix IWallpaperEngineWrapper NPE in wearOS

A crash was detected in wearOS. Simply add a null check to avoid that.

Bug: 282156194
Test: treehugger (very safe, just a null check)
Change-Id: I016c3c942b1b0099eaa423cad4b4d60c90804c79
---
 core/java/android/service/wallpaper/WallpaperService.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/java/android/service/wallpaper/WallpaperService.java b/core/java/android/service/wallpaper/WallpaperService.java
index 230f51191ee89..7f0a666da91fa 100644
--- a/core/java/android/service/wallpaper/WallpaperService.java
+++ b/core/java/android/service/wallpaper/WallpaperService.java
@@ -2231,7 +2231,7 @@ public abstract class WallpaperService extends Service {
 
             mDestroyed = true;
 
-            if (mIWallpaperEngine.mDisplayManager != null) {
+            if (mIWallpaperEngine != null && mIWallpaperEngine.mDisplayManager != null) {
                 mIWallpaperEngine.mDisplayManager.unregisterDisplayListener(mDisplayListener);
             }