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

Commit 20184907 authored by Aurélien Pomini's avatar Aurélien Pomini Committed by Automerger Merge Worker
Browse files

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

Merge "Fix IWallpaperEngineWrapper NPE in wearOS" into udc-dev am: c9285e09 am: 7f0e310a am: 4aa230e6

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



Change-Id: I60df13aac565d1c9be0727d52421599e85efc69d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b69aeb98 4aa230e6

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

            }