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

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

am 74ee938d: resolved conflicts for merge of ffb22827 to master 

* commit '74ee938d':
  Fix FLAG_DISMISS_KEYGUARD not working
parents 624818b0 74ee938d

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

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

            }





            final boolean showWhenLocked = (fl & FLAG_SHOW_WHEN_LOCKED) != 0;

            final boolean showWhenLocked = (fl & FLAG_SHOW_WHEN_LOCKED) != 0;

            final boolean dismissKeyguard = (fl & FLAG_DISMISS_KEYGUARD) != 0;

            if (appWindow) {

            if (appWindow) {

                if (showWhenLocked) {

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

                    mAppsToBeHidden.remove(win.getAppToken());

                    mAppsToBeHidden.remove(win.getAppToken());

                } else {

                } else {

                    mAppsToBeHidden.add(win.getAppToken());

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

                            mHideLockScreen = true;

                            mForceStatusBarFromKeyguard = false;

                            mForceStatusBarFromKeyguard = false;

                        }

                        }

                        if ((fl & FLAG_DISMISS_KEYGUARD) != 0

                        if (dismissKeyguard && mDismissKeyguard == DISMISS_KEYGUARD_NONE) {

                                && mDismissKeyguard == DISMISS_KEYGUARD_NONE) {

                            if (DEBUG_LAYOUT) Slog.v(TAG,

                            if (DEBUG_LAYOUT) Slog.v(TAG,

                                    "Setting mDismissKeyguard true by win " + win);

                                    "Setting mDismissKeyguard true by win " + win);

                            mDismissKeyguard = mWinDismissingKeyguard == win ?

                            mDismissKeyguard = mWinDismissingKeyguard == win ?