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

Commit 45f0d572 authored by Jerry Chang's avatar Jerry Chang
Browse files

Prevent NPE whlie leaving windowless dream service. 

There might having windowless dream service like doze dream which won't
hava attached activity, so call finish() directly in onWakeUp() since
finish() itself deals with finishAndRemoveTask() as well.

Fix: b/150110220
Test: manual test, won't throw NPE while leaving doze service.
Change-Id: I982c2f6fb1859e869732ef8795b61bf96e8cff64
parent 4baae9c2

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

+9 −8
Original line number Diff line number Diff line
@@ -883,7 +883,7 @@ public class DreamService extends Service implements Window.Callback { 
     * </p>

     */

    public void onWakeUp() {

        mActivity.finishAndRemoveTask();

        finish();

    }



    /** {@inheritDoc} */
@@ -904,14 +904,15 @@ public class DreamService extends Service implements Window.Callback { 
    public final void finish() {

        if (mDebug) Slog.v(TAG, "finish(): mFinished=" + mFinished);



        if (mActivity == null) {

            Slog.w(TAG, "Finish was called before the dream was attached.");

        } else if (!mActivity.isFinishing()) {

            // In case the activity is not finished yet, do it now. This can happen if someone calls

            // finish() directly, without going through wakeUp().

        if (mActivity != null) {

            if (!mActivity.isFinishing()) {

                // In case the activity is not finished yet, do it now.

                mActivity.finishAndRemoveTask();

                return;

            }

        } else if (!mWindowless) {

            Slog.w(TAG, "Finish was called before the dream was attached.");

        }



        if (!mFinished) {

            mFinished = true;
@@ -1010,7 +1011,7 @@ public class DreamService extends Service implements Window.Callback { 
     * @param started A callback that will be invoked once onDreamingStarted has completed.

     */

    private void attach(IBinder dreamToken, boolean canDoze, IRemoteCallback started) {

        if (mActivity != null) {

        if (mDreamToken != null) {

            Slog.e(TAG, "attach() called when dream with token=" + mDreamToken

                    + " already attached");

            return;