| commit | 6122f0ed1ec662067d83f0bf2b2ab6ac299ab63a | [log] [tgz] |
|---|---|---|
| author | Aurélien Pomini <pomini@google.com> | Mon May 15 16:20:21 2023 +0000 |
| committer | Aurélien Pomini <pomini@google.com> | Mon May 15 16:20:21 2023 +0000 |
| tree | c858d7451bfbf8a5fdfb5ea47aa6689284295847 | |
| parent | 096bfe59f88fa44a1d1ba1dfc49b4b6ddb63c33d [diff] |
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
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); }