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

Commit 823ecfb1 authored by Galia Peycheva's avatar Galia Peycheva Committed by Automerger Merge Worker
Browse files

Merge "Fix DreamService not finishing correctly" into rvc-dev am: e7eee891 

Change-Id: I21a4a59c47ce90b388ee322b93b3f33463765786
parents 0ea7534a e7eee891

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();

                    }

                });