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

Commit 95b12348 authored by Galia Peycheva's avatar Galia Peycheva
Browse files

Fix DreamService not finishing correctly 

CL assigns null to DreamService.mActivity when the DecorView of the
main window is detached (in onViewDetachedFromWindow()). This is also
when the Window is detached, so at that point the DreamService doesn't
care about the DreamActivity.

Fix: 152994058

Test: atest DreamManagerServiceTests

Change-Id: I716f443b2876a2db57df999a551eee31e98ab4f1
parent a171ec42

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

+5 −3
Original line number Diff line number Diff line
@@ -900,10 +900,11 @@ public class DreamService extends Service implements Window.Callback { 
    public final void finish() {

        if (mDebug) Slog.v(TAG, "finish(): mFinished=" + mFinished);



        if (mActivity != null) {

            if (!mActivity.isFinishing()) {

        Activity activity = mActivity;

        if (activity != null) {

            if (!activity.isFinishing()) {

                // In case the activity is not finished yet, do it now.

                mActivity.finishAndRemoveTask();

                activity.finishAndRemoveTask();

            }

            return;

        }
@@ -1106,6 +1107,7 @@ public class DreamService extends Service implements Window.Callback { 


                    @Override

                    public void onViewDetachedFromWindow(View v) {

                        mActivity = null;

                        finish();

                    }

                });