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

Commit 77e15a50 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

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

Merge "[conflict] Merge "Respect always unlocked displays when keyguard is shown." into udc-dev am: 68c74f4c am: f2f4f3c8"
parents bdc98a4a 87e95eb8

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

+3 −1
Original line number Diff line number Diff line
@@ -1060,8 +1060,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) {