commit c9285e0921bb38296c5e3dae39b418c79bb7cefb
author Aurélien Pomini <pomini@google.com> Tue May 16 12:06:32 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue May 16 12:06:32 2023 +0000
tree 92827dcd767297eaa650f3295bc7f88087a1fc1b
parent 39f880eaff46159e641563fa27ea05fe4ed201a2
parent 6122f0ed1ec662067d83f0bf2b2ab6ac299ab63a

Merge "Fix IWallpaperEngineWrapper NPE in wearOS" into udc-dev

core/java/android/service/wallpaper/WallpaperService.java

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