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

Commit 50688091 authored by Vladimir Komsiyski's avatar Vladimir Komsiyski
Browse files

[conflict] Merge "Respect always unlocked displays when keyguard is shown."... 

[conflict] Merge "Respect always unlocked displays when keyguard is shown." into udc-dev am: 68c74f4c am: c255fade am: 0976919c

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23692527



Change-Id: I1910d409f4813b91ba0afc8c4e099ffa18a98ffe
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 635a48b3 0976919c

services/core/java/com/android/server/wm/RootWindowContainer.java

+3 −1
Original line number Diff line number Diff line
@@ -1058,8 +1058,10 @@ class RootWindowContainer extends WindowContainer<DisplayContent> 
                displayHasContent = true;

            } else if (displayContent != null &&

                    (!mObscureApplicationContentOnSecondaryDisplays

                            || displayContent.isKeyguardAlwaysUnlocked()

                            || (obscured && w.mAttrs.type == TYPE_KEYGUARD_DIALOG))) {

                // Allow full screen keyguard presentation dialogs to be seen.

                // Allow full screen keyguard presentation dialogs to be seen, or simply ignore the

                // keyguard if this display is always unlocked.

                displayHasContent = true;

            }

            if ((w.mAttrs.privateFlags & PRIVATE_FLAG_SUSTAINED_PERFORMANCE_MODE) != 0) {