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

Commit 2af9efb2 authored by Louis Chang's avatar Louis Chang
Browse files

Avoid unexpected turning screen on when top activity finishes 

The ActivityRecord#mCurrentLaunchCanTurnScreenOn is true while
the Activity was started and created. However, another activity
may immediately started afterward. Once the top activity finishes
while the display is off, the display was unexpected turn on
since the next top activity is able to turn screen on.

Reset the can-turn-screen-on state of the last started activity
when starting a new activity.

Bug: 270827073
Bug: 241961202
Test: verified on sample app
Change-Id: I2c2d15e1a1a68d583d42dde69aef2f596cd064b5
parent fae45798

services/core/java/com/android/server/wm/ActivityStarter.java

+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;