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

Commit be5a9186 authored by Bryce Lee's avatar Bryce Lee Committed by Automerger Merge Worker
Browse files

Merge "Clear DreamOverlayCallback reference on destroy." into udc-qpr-dev am:... 

Merge "Clear DreamOverlayCallback reference on destroy." into udc-qpr-dev am: 651440d1 am: f507d01f

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



Change-Id: I762aff706aa411cfc6db868a2d0cebdf193fdc14
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b4193f44 f507d01f

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

+9 −8
Original line number Diff line number Diff line
@@ -244,13 +244,7 @@ public class DreamService extends Service implements Window.Callback { 


    private DreamOverlayConnectionHandler mOverlayConnection;



    private final IDreamOverlayCallback mOverlayCallback = new IDreamOverlayCallback.Stub() {

        @Override

        public void onExitRequested() {

            // Simply finish dream when exit is requested.

            mHandler.post(() -> finish());

        }

    };

    private IDreamOverlayCallback mOverlayCallback;





    public DreamService() {
@@ -877,6 +871,13 @@ public class DreamService extends Service implements Window.Callback { 
        mDreamComponent = new ComponentName(this, getClass());

        mShouldShowComplications = fetchShouldShowComplications(this /*context*/,

                fetchServiceInfo(this /*context*/, mDreamComponent));

        mOverlayCallback = new IDreamOverlayCallback.Stub() {

            @Override

            public void onExitRequested() {

                // Simply finish dream when exit is requested.

                mHandler.post(() -> finish());

            }

        };



        super.onCreate();

    }
@@ -1083,7 +1084,7 @@ public class DreamService extends Service implements Window.Callback { 


        // Just in case destroy came in before detach, let's take care of that now

        detach();



        mOverlayCallback = null;

        super.onDestroy();

    }