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

Commit 68c74f4c authored by Vladimir Komsiyski's avatar Vladimir Komsiyski Committed by Android (Google) Code Review
Browse files

Merge "Respect always unlocked displays when keyguard is shown." into udc-dev

parents 37ccbe73 1df55100

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

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

                displayHasContent = true;

            } else if (displayContent != null &&

            } else if (displayContent != null &&

                    (!mObscureApplicationContentOnSecondaryDisplays

                    (!mObscureApplicationContentOnSecondaryDisplays

                            || displayContent.isKeyguardAlwaysUnlocked()

                            || (obscured && type == TYPE_KEYGUARD_DIALOG))) {

                            || (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;

                displayHasContent = true;

            }

            }

            if ((privateflags & PRIVATE_FLAG_SUSTAINED_PERFORMANCE_MODE) != 0) {

            if ((privateflags & PRIVATE_FLAG_SUSTAINED_PERFORMANCE_MODE) != 0) {