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

Commit d5e4503c authored by Bryce Lee's avatar Bryce Lee Committed by Android (Google) Code Review
Browse files

Merge "Unbind from overlay before checking attached." into tm-dev

parents a2df99e5 410b5a6f

core/java/android/service/dreams/DreamService.java

+2 −2
Original line number Diff line number Diff line
@@ -1038,14 +1038,14 @@ public class DreamService extends Service implements Window.Callback { 
        }

        mFinished = true;



        mOverlayConnection.unbind(this);



        if (mDreamToken == null) {

            Slog.w(mTag, "Finish was called before the dream was attached.");

            stopSelf();

            return;

        }



        mOverlayConnection.unbind(this);



        try {

            // finishSelf will unbind the dream controller from the dream service. This will

            // trigger DreamService.this.onDestroy and DreamService.this will die.