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

Commit 8c6e6e73 authored by Craig Mautner's avatar Craig Mautner Committed by Android Git Automerger
Browse files

am 13b75939: am d4d2aa51: am efbe7cc0: am d1c82f8f: am 1cb3c1d3: am fc80fbe3:... 

am 13b75939: am d4d2aa51: am efbe7cc0: am d1c82f8f: am 1cb3c1d3: am fc80fbe3: am 7bd0b652: am 4bdab6bb: Fix FLAG_DISMISS_KEYGUARD not working

* commit '13b75939':
  Fix FLAG_DISMISS_KEYGUARD not working
parents cc4d10d0 13b75939

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

+3 −3
Original line number Diff line number Diff line
@@ -3265,8 +3265,9 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
            }



            final boolean showWhenLocked = (attrs.flags & FLAG_SHOW_WHEN_LOCKED) != 0;

            final boolean dismissKeyguard = (attrs.flags & FLAG_DISMISS_KEYGUARD) != 0;

            if (appWindow) {

                if (showWhenLocked) {

                if (showWhenLocked || (dismissKeyguard && !isKeyguardSecure())) {

                    mAppsToBeHidden.remove(win.getAppToken());

                } else {

                    mAppsToBeHidden.add(win.getAppToken());
@@ -3282,8 +3283,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
                            mHideLockScreen = true;

                            mForceStatusBarFromKeyguard = false;

                        }

                        if ((attrs.flags & FLAG_DISMISS_KEYGUARD) != 0

                                && mDismissKeyguard == DISMISS_KEYGUARD_NONE) {

                        if (dismissKeyguard && mDismissKeyguard == DISMISS_KEYGUARD_NONE) {

                            if (DEBUG_LAYOUT) Slog.v(TAG, "Setting mDismissKeyguard true by win " + win);

                            mDismissKeyguard = mWinDismissingKeyguard == win ?

                                    DISMISS_KEYGUARD_CONTINUE : DISMISS_KEYGUARD_START;