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

This commit is contained in:
Aurélien Pomini
2023-05-16 12:06:32 +00:00
committed by Android (Google) Code Review

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