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: f2f4f3c8c7

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

Change-Id: I8db9825154059fab8c0b270066c6cb547e1d7037
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:58:44 +00:00
parent 651e3327a3 f2f4f3c8c7
commit 87e95eb8fd
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) {