Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix IWallpaperEngineWrapper NPE in wearOS" into udc-dev am: c9285e0921 am: 7f0e310a74

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23244216

Change-Id: Icea851f25ec040ddc3a48316bbf3a87238c57623
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Aurélien Pomini
2023-05-16 13:33:30 +00:00
committed by Automerger Merge Worker
parent 3cc1031a76 7f0e310a74
commit 4aa230e6c9
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/service/wallpaper/WallpaperService.java
View File

@@ -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);
}