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

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

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

Change-Id: I406ecd8084f563152fa4d8ca3cd59d1bf055ddff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Vladimir Komsiyski
2023-06-27 09:18:43 +00:00
committed by Automerger Merge Worker
parent fc3434959a 68c74f4c51
commit c255fadec8
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

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