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

Commit ae6a6c8f authored by Automerger Merge Worker's avatar Automerger Merge Worker Committed by Android (Google) Code Review
Browse files

Merge "Merge "Make DreamService detach on DreamActivity onDestroy" into... 

Merge "Merge "Make DreamService detach on DreamActivity onDestroy" into udc-dev am: 10104fcc am: 80c83691"
parents 91371953 c5b69ed7

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();

        }

    }