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

Commit 74ee938d authored by Craig Mautner's avatar Craig Mautner
Browse files

resolved conflicts for merge of ffb22827 to master 

Change-Id: Ia01028203dfe87df91c828d681289e92b9371e3c
parents 4126693b ffb22827

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

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



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

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

            if (appWindow) {

                if (showWhenLocked) {

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

                    mAppsToBeHidden.remove(win.getAppToken());

                } else {

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

                            mForceStatusBarFromKeyguard = false;

                        }

                        if ((fl & 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 ?