[automerge] Check for nullness in WallpaperService onDestroy 2p: 784a9ec804
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22761496 Bug: 275361339 Change-Id: Ia62bcfe3c87d9f217069bfd359c17990edccf33e Merged-In: I89076da179493fa282f3e59895cfa4f4bfb6bdfc
This commit is contained in:
@@ -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();
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user