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

Commit 525a0491 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

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

* changes:
  [automerge] Check for nullness in WallpaperService onDestroy 2p: 784a9ec8
  Check for nullness in WallpaperService onDestroy
parents 43339c0a 232e250f

core/java/android/service/wallpaper/WallpaperService.java

+6 −1
Original line number Diff line number Diff line
@@ -2610,7 +2610,12 @@ public abstract class WallpaperService extends Service { 
            mActiveEngines.get(i).detach();

        }

        mActiveEngines.clear();

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

    }