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

Commit 55710482 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: 4dfd3dcd

Change-Id: Ica2a8b1cc55c88ba705e0213180f175da87e274b
parents 5a00aa29 4dfd3dcd

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

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




                    @Override

                    @Override

                    public void onViewDetachedFromWindow(View v) {

                    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;

                            mActivity = null;

                            finish();

                            finish();

                        }

                        }

                    }

                });

                });

    }

    }