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

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

Merge "Fixes NPE for some live wallpapers" into main

parents 3ccf6490 4252d66b

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

+6 −1
Original line number Diff line number Diff line
@@ -2623,7 +2623,12 @@ public abstract class WallpaperService extends Service { 


        private void doAttachEngine() {

            Trace.beginSection("WPMS.onCreateEngine");

            Engine engine = onCreateEngine(mDescription);

            Engine engine;

            if (mDescription != null) {

                engine = onCreateEngine(mDescription);

            } else {

                engine = onCreateEngine();

            }

            Trace.endSection();

            mEngine = engine;

            Trace.beginSection("WPMS.mConnection.attachEngine-" + mDisplayId);