diff options
| author | 2023-06-27 09:14:22 +0000 | |
|---|---|---|
| committer | 2023-06-27 10:04:07 +0000 | |
| commit | 77fa67e4248fa9609e9446e051a0f403e9cae8f5 (patch) | |
| tree | 8ac661dacb50eb358769995914334a60adace7bb | |
| parent | b2112cc73c4be02eab8f4935734a62392d052de6 (diff) | |
| parent | 68c74f4c51f3d630b1f1d5293603a006c7911ca2 (diff) | |
[conflict] Merge "Respect always unlocked displays when keyguard is shown." into udc-dev am: 68c74f4c51
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23692527
Change-Id: Ib906a8dd6f20de3f80248f8225e5e7f9c460cf61
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | services/core/java/com/android/server/wm/RootWindowContainer.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/wm/RootWindowContainer.java b/services/core/java/com/android/server/wm/RootWindowContainer.java index 65cd6db6a167..e58bd287b7bf 100644 --- a/services/core/java/com/android/server/wm/RootWindowContainer.java +++ b/services/core/java/com/android/server/wm/RootWindowContainer.java @@ -1058,8 +1058,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) { |