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

Commit 56f10c26 authored by Craig Mautner's avatar Craig Mautner Committed by Android Git Automerger
Browse files

am a9355bd1: Merge "Handle keyguard dismiss flags correctly" into lmp-mr1-dev 

* commit 'a9355bd1':
  Handle keyguard dismiss flags correctly
parents 9aa9e46b a9355bd1

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

+3 −3
Original line number Diff line number Diff line
@@ -4049,12 +4049,12 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
                    mAppsToBeHidden.remove(appToken);

                    mAppsThatDismissKeyguard.remove(appToken);

                    if (mAppsToBeHidden.isEmpty()) {

                        if (mKeyguardSecureIncludingHidden) {

                        if (dismissKeyguard && !mKeyguardSecure) {

                            mAppsThatDismissKeyguard.add(appToken);

                        } else {

                            mWinShowWhenLocked = win;

                            mHideLockScreen = true;

                            mForceStatusBarFromKeyguard = false;

                        } else if (dismissKeyguard && !mKeyguardSecure) {

                            mAppsThatDismissKeyguard.add(appToken);

                        }

                    }

                } else if (dismissKeyguard) {