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

Commit f2a02e99 authored by Sindhu B's avatar Sindhu B Committed by Android (Google) Code Review
Browse files

Merge "Migrate the remaining instances of the dreamManager.finishSelf method... 

Merge "Migrate the remaining instances of the dreamManager.finishSelf method to the new oneway version." into main
parents 604556c6 65c7857b

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

+10 −2
Original line number Diff line number Diff line
@@ -1346,7 +1346,11 @@ public class DreamService extends Service implements Window.Callback { 
                    Slog.w(mTag, "WakeUp was called before the dream was attached.");

                } else {

                    try {

                        if (startAndStopDozingInBackground()) {

                            mDreamManager.finishSelfOneway(mDreamToken, false /*immediate*/);

                        } else {

                            mDreamManager.finishSelf(mDreamToken, false /*immediate*/);

                        }

                    } catch (RemoteException ex) {

                        // system server died

                    }
@@ -1497,7 +1501,11 @@ public class DreamService extends Service implements Window.Callback { 
        if (mFinished || mWaking) {

            Slog.w(mTag, "attach() called after dream already finished");

            try {

                if (startAndStopDozingInBackground()) {

                    mDreamManager.finishSelfOneway(dreamToken, true /*immediate*/);

                } else {

                    mDreamManager.finishSelf(dreamToken, true /*immediate*/);

                }

            } catch (RemoteException ex) {

                // system server died

            }