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

Commit f4344ef7 authored by Matthew Ng's avatar Matthew Ng
Browse files

Dismiss docked stack when ShowWhenLocked activity is over keyguard (1/2) 

Activities with ShowWhenLocked flag when docked should dismiss the
docked stack and appear after screen turns back on. This incorporates
missing code from ag/1013634 that was missed during refactoring.

Fixes: 36166079
Test: run-test CtsServicesHostTestCases
android.server.cts.KeyguardTests#testShowWhenLockedActivityWhileSplit
Change-Id: I003cdd0be46fe6b9640e2bfbfca582150f2723b7
parent 4b32f7c6

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

+1 −0
Original line number Diff line number Diff line
@@ -95,6 +95,7 @@ class KeyguardController { 
            return;

        }

        mKeyguardShowing = showing;

        dismissDockedStackIfNeeded();

        if (showing) {

            mKeyguardGoingAway = false;

            mDismissalRequested = false;