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

Commit 8daced54 authored by Bryce Lee's avatar Bryce Lee Committed by Android (Google) Code Review
Browse files

Merge "Prevent stopping dream immediately."

parents 153d347c 70ecf24b

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) {

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

            mCallback.onActivityDestroyed();

        }

services/core/java/com/android/server/dreams/DreamManagerService.java

+1 −1
Original line number Diff line number Diff line
@@ -462,7 +462,7 @@ public final class DreamManagerService extends SystemService { 
    }



    protected void requestStopDreamFromShell() {

        stopDreamInternal(true, "stopping dream from shell");

        stopDreamInternal(false, "stopping dream from shell");

    }



    private void stopDreamInternal(boolean immediate, String reason) {