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

Commit e12c8f5d authored by Issei Suzuki's avatar Issei Suzuki
Browse files

Clear ActivityRecord#mDismissKeyguard flag after app launches. 

This flag is used by the SysUI to dismiss an insecure keyguard
when an app is launched from an insecure lock screen. The flag
should only affect the app launch once, so needs to be cleared
once the flag is processed.

Bug: 234583880
Test: atest KeyguardTests#testDismissKeyguard_fromActivityOption_onlyOnce
Change-Id: Ia4179b40de7d45b2199b175a6dcc24016dfba091
(cherry picked from commit 41cbf49a)
parent 811c0f0b

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

+0 −1
Original line number Diff line number Diff line
@@ -7343,7 +7343,6 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A 
        mTransit = TRANSIT_OLD_UNSET;

        mTransitFlags = 0;

        mNeedsAnimationBoundsLayer = false;

        mDismissKeyguard = false;



        setAppLayoutChanges(FINISH_LAYOUT_REDO_ANIM | FINISH_LAYOUT_REDO_WALLPAPER,

                "ActivityRecord");

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

+1 −0
Original line number Diff line number Diff line
@@ -595,6 +595,7 @@ class KeyguardController { 
                } else if (top.canShowWhenLocked()) {

                    mTopOccludesActivity = top;

                }

                top.mDismissKeyguard = false;



                // Only the top activity may control occluded, as we can't occlude the Keyguard

                // if the top app doesn't want to occlude it.