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

Commit f89046ff authored by Louis Chang's avatar Louis Chang Committed by Android (Google) Code Review
Browse files

Merge "Avoid unexpected turning screen on when top activity finishes" into udc-qpr-dev

parents c3d53f82 2af9efb2
Loading
Loading
Loading
Loading
+5 −0
Original line number Diff line number Diff line
@@ -898,6 +898,11 @@ class ActivityStarter {
        }
        mLastStartReason = request.reason;
        mLastStartActivityTimeMs = System.currentTimeMillis();
        // Reset the ActivityRecord#mCurrentLaunchCanTurnScreenOn state of last start activity in
        // case the state is not yet consumed during rapid activity launch.
        if (mLastStartActivityRecord != null) {
            mLastStartActivityRecord.setCurrentLaunchCanTurnScreenOn(false);
        }
        mLastStartActivityRecord = null;

        final IApplicationThread caller = request.caller;