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

Commit f2f4f3c8 authored by Vladimir Komsiyski's avatar Vladimir Komsiyski Committed by Automerger Merge Worker
Browse files

Merge "Respect always unlocked displays when keyguard is shown." into udc-dev am: 68c74f4c 

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



Change-Id: I0c32a50d6e321a8fdd2876217aea9b8507373fbf
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9a3a9d21 68c74f4c

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

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

            } else if (displayContent != null &&

                    (!mObscureApplicationContentOnSecondaryDisplays

                            || displayContent.isKeyguardAlwaysUnlocked()

                            || (obscured && 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 ((privateflags & PRIVATE_FLAG_SUSTAINED_PERFORMANCE_MODE) != 0) {