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

Commit c6c8c58f authored by Riddle Hsu's avatar Riddle Hsu Committed by Automerger Merge Worker
Browse files

Merge "Do not stop dream service if dream activity is relaunching" into... 

Merge "Do not stop dream service if dream activity is relaunching" into rvc-dev am: b76f9472 am: 10662e54

Change-Id: I8c89cbf67d648878c71c92574ce89090fc2de6bd
parents 5594bff4 10662e54

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

+6 −2
Original line number Diff line number Diff line
@@ -1075,9 +1075,13 @@ public class DreamService extends Service implements Window.Callback { 


                    @Override

                    public void onViewDetachedFromWindow(View v) {

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

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

                            // activity for configuration changes.

                            mActivity = null;

                            finish();

                        }

                    }

                });

    }