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

Commit 4d441e88 authored by Bryce Lee's avatar Bryce Lee Committed by Automerger Merge Worker
Browse files

Merge "Unbind from overlay before checking attached." into tm-dev am: d5e4503c am: 3788344c 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17574386



Change-Id: Id29e0470634af81f6466bb9f489d68cfb07b1e2d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents cfe03e43 3788344c

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.