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

Commit 491c2dbf authored by Louis Chang's avatar Louis Chang
Browse files

Prevents activity becomes invisible while keyguard going-away 

Or the activity could be RESUMED while being invisible.

Bug: 365486631
Test: wm presubmit
Flag: EXEMPT bugfix
Change-Id: Ia4e8d6f4416ac5f3d6da4ea5feee9ded6ac426aa
parent 83cec94c

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

+4 −3
Original line number Diff line number Diff line
@@ -6079,9 +6079,10 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A 
            return false;

        }



        // Check if the activity is on a sleeping display, canTurnScreenOn will also check

        // keyguard visibility

        if (mDisplayContent.isSleeping()) {

        // Check if the activity is on a sleeping display and keyguard is not going away (to

        // align with TaskFragment#shouldSleepActivities), canTurnScreenOn will also check keyguard

        // visibility

        if (mDisplayContent.isSleeping() && !mDisplayContent.isKeyguardGoingAway()) {

            return canTurnScreenOn();

        } else {

            return mTaskSupervisor.getKeyguardController().checkKeyguardVisibility(this);