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

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

Merge "Clear reference to DreamActivity window." into tm-dev

parents d5d1340a abfdc8fc

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

+3 −1
Original line number Original line Diff line number Diff line
@@ -1341,7 +1341,9 @@ public class DreamService extends Service implements Window.Callback { 
                    public void onViewDetachedFromWindow(View v) {

                    public void onViewDetachedFromWindow(View v) {

                        if (mActivity == null || !mActivity.isChangingConfigurations()) {

                        if (mActivity == null || !mActivity.isChangingConfigurations()) {

                            // Only stop the dream if the view is not detached by relaunching

                            // Only stop the dream if the view is not detached by relaunching

                            // activity for configuration changes.

                            // activity for configuration changes. It is important to also clear

                            // the window reference in order to fully release the DreamActivity.

                            mWindow = null;

                            mActivity = null;

                            mActivity = null;

                            finish();

                            finish();

                        }

                        }