From c3e257fc007faaa4ab3f1a297fe2a4b0fc85f58a Mon Sep 17 00:00:00 2001 From: Nicolo' Mazzucato Date: Thu, 20 Apr 2023 11:35:28 +0000 Subject: [PATCH] Check for nullness in WallpaperService onDestroy There are cases where the WallpaperService API is misused and an instance is created manually. In those cases, onCreate is not called as expected, but onDestroy is. As mBackgroundThread was being created `onCreate`, it ended up being null in onDestroy. Adding a null check to avoid breaking those places. Bug: 275361339 Test: androidx.wear.watchface.editor.EditorSessionTest#commitWithPreviewImage Change-Id: I89076da179493fa282f3e59895cfa4f4bfb6bdfc --- core/java/android/service/wallpaper/WallpaperService.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/core/java/android/service/wallpaper/WallpaperService.java b/core/java/android/service/wallpaper/WallpaperService.java index 9d3d70d4a8f78..8d84e44136352 100644 --- a/core/java/android/service/wallpaper/WallpaperService.java +++ b/core/java/android/service/wallpaper/WallpaperService.java @@ -2738,7 +2738,12 @@ public abstract class WallpaperService extends Service { engineWrapper.destroy(); } mActiveEngines.clear(); - mBackgroundThread.quitSafely(); + if (mBackgroundThread != null) { + // onDestroy might be called without a previous onCreate if WallpaperService was + // instantiated manually. While this is a misuse of the API, some things break + // if here we don't take into consideration this scenario. + mBackgroundThread.quitSafely(); + } Trace.endSection(); }