Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "[conflict] Merge "Respect always unlocked displays when keyguard is shown." into udc-dev am: 68c74f4c51 am: f2f4f3c8c7"

Browse Source
This commit is contained in:
TreeHugger Robot
2023-06-27 12:28:18 +00:00
committed by Android (Google) Code Review
parent bdc98a4af7 87e95eb8fd
commit 77e15a507d
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/java/com/android/server/wm/RootWindowContainer.java
View File

@@ -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) {