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

Commit e66d8128 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: Ia9c5f5254029d2058e1ddb6cb55b077d7d955f62
parents 7689af74 e7eee891

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

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

    public final void finish() {

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

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





        if (mActivity != null) {

        Activity activity = mActivity;

            if (!mActivity.isFinishing()) {

        if (activity != null) {

            if (!activity.isFinishing()) {

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

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

                mActivity.finishAndRemoveTask();

                activity.finishAndRemoveTask();

            }

            }

            return;

            return;

        }

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




                    @Override

                    @Override

                    public void onViewDetachedFromWindow(View v) {

                    public void onViewDetachedFromWindow(View v) {

                        mActivity = null;

                        finish();

                        finish();

                    }

                    }

                });

                });