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

Commit 61a7b7cf authored by Craig Mautner's avatar Craig Mautner Committed by Android Git Automerger
Browse files

am e4e7d2cd: am 41ec0400: Merge "Dismiss insecure keyguards if... 

am e4e7d2cd: am 41ec0400: Merge "Dismiss insecure keyguards if FLAG_SHOW_WHEN_LOCKED" into lmp-mr1-dev

* commit 'e4e7d2cd':
  Dismiss insecure keyguards if FLAG_SHOW_WHEN_LOCKED
parents cc4cd6e1 e4e7d2cd

policy/src/com/android/internal/policy/impl/PhoneWindowManager.java

+8 −4
Original line number Diff line number Diff line
@@ -4048,10 +4048,14 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
                    // Remove any previous windows with the same appToken.

                    mAppsToBeHidden.remove(appToken);

                    mAppsThatDismissKeyguard.remove(appToken);

                    if (mAppsToBeHidden.isEmpty() && mKeyguardSecureIncludingHidden) {

                    if (mAppsToBeHidden.isEmpty()) {

                        if (mKeyguardSecureIncludingHidden) {

                            mWinShowWhenLocked = win;

                            mHideLockScreen = true;

                            mForceStatusBarFromKeyguard = false;

                        } else if (dismissKeyguard && !mKeyguardSecure) {

                            mAppsThatDismissKeyguard.add(appToken);

                        }

                    }

                } else if (dismissKeyguard) {

                    if (mKeyguardSecure) {