Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c9285e09 authored by Aurélien Pomini's avatar Aurélien Pomini Committed by Android (Google) Code Review
Browse files

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

parents 39f880ea 6122f0ed

core/java/android/service/wallpaper/WallpaperService.java

+1 −1
Original line number Diff line number Diff line
@@ -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);

            }