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: I77d7f7a8022d47b009cd1f3ea3c7cb3d4f0c82db Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -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);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user