diff --git a/core/java/android/service/wallpaper/WallpaperService.java b/core/java/android/service/wallpaper/WallpaperService.java index 230f51191ee89..7f0a666da91fa 100644 --- a/core/java/android/service/wallpaper/WallpaperService.java +++ b/core/java/android/service/wallpaper/WallpaperService.java @@ -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); }