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

Commit 83d1a606 authored by Automerger Merge Worker's avatar Automerger Merge Worker Committed by Android (Google) Code Review
Browse files

Merge "Merge "Check for nullness in WallpaperService onDestroy" into udc-dev...

Merge "Merge "Check for nullness in WallpaperService onDestroy" into udc-dev am: 1ce89ea1 am: b30d6970"
parents 7a28d004 7fbeb2ea
Loading
Loading
Loading
Loading
+6 −1
Original line number Diff line number Diff line
@@ -2738,7 +2738,12 @@ public abstract class WallpaperService extends Service {
            engineWrapper.destroy();
        }
        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();
    }