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

Commit 2dbf160a authored by Galia Peycheva's avatar Galia Peycheva Committed by Automerger Merge Worker
Browse files

Merge "Make DreamService detach on DreamActivity onDestroy" into udc-dev am: 10104fcc 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21610512



Change-Id: I7723fc830a10ca29a7b6301346989a189ceae7b1
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 1bf6ffb1 10104fcc

core/java/android/service/dreams/DreamActivity.java

+1 −1
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ public class DreamActivity extends Activity { 


    @Override

    public void onDestroy() {

        if (mCallback != null && !isFinishing()) {

        if (mCallback != null) {

            mCallback.onActivityDestroyed();

        }

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

+2 −1
Original line number Diff line number Diff line
@@ -1588,7 +1588,8 @@ public class DreamService extends Service implements Window.Callback { 
        // If DreamActivity is destroyed, wake up from Dream.

        void onActivityDestroyed() {

            mActivity = null;

            onDestroy();

            mWindow = null;

            detach();

        }

    }