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

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

Change-Id: I9fdb5a4bef6b8d873f1669ca4b93fe5f78b1e1e4
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 12:50:15 +00:00
committed by Automerger Merge Worker

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