Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes from topic "presubmit-am-69ddccefeecc48c0aa4853fb38096762" into tm-qpr-dev-plus-aosp

Browse Source 
* changes:
  [automerge] Check for nullness in WallpaperService onDestroy 2p: 784a9ec804
  Check for nullness in WallpaperService onDestroy
This commit is contained in:
Treehugger Robot
2023-04-20 23:42:26 +00:00
committed by Android (Google) Code Review
parent 43339c0ac5 232e250f4c
commit 525a049132
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/java/android/service/wallpaper/WallpaperService.java
View File

@@ -2610,7 +2610,12 @@ public abstract class WallpaperService extends Service {
mActiveEngines.get(i).detach();
}
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();
}