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

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

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

Change-Id: I94ef6035264a98dede476a6edc25cc7c02b31f54
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Vladimir Komsiyski
2023-06-27 13:06:38 +00:00
committed by Automerger Merge Worker
parent b3e0012bde 77fa67e424
commit 190696b91c
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

@@ -1058,8 +1058,10 @@ class RootWindowContainer extends WindowContainer<DisplayContent>
displayHasContent = true; displayHasContent = true;
} else if (displayContent != null && } else if (displayContent != null &&
(!mObscureApplicationContentOnSecondaryDisplays (!mObscureApplicationContentOnSecondaryDisplays
|| displayContent.isKeyguardAlwaysUnlocked()
|| (obscured && w.mAttrs.type == TYPE_KEYGUARD_DIALOG))) { || (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; displayHasContent = true;
} }
if ((w.mAttrs.privateFlags & PRIVATE_FLAG_SUSTAINED_PERFORMANCE_MODE) != 0) { if ((w.mAttrs.privateFlags & PRIVATE_FLAG_SUSTAINED_PERFORMANCE_MODE) != 0) {