diff options
| author | 2023-06-27 09:18:43 +0000 | |
|---|---|---|
| committer | 2023-06-27 09:18:43 +0000 | |
| commit | c255fadec8e8df45c0734cf24e7851ae5763dce8 (patch) | |
| tree | 5d188f649322bbefdf3f8d95cb1611a9e8a6f773 | |
| parent | fc3434959ae1f8d6c91f855969a4c9fd8d789007 (diff) | |
| parent | 68c74f4c51f3d630b1f1d5293603a006c7911ca2 (diff) | |
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: I406ecd8084f563152fa4d8ca3cd59d1bf055ddff
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 54fec3e2f844..d9a954f1973b 100644 --- a/services/core/java/com/android/server/wm/RootWindowContainer.java +++ b/services/core/java/com/android/server/wm/RootWindowContainer.java @@ -1061,8 +1061,10 @@ class RootWindowContainer extends WindowContainer<DisplayContent> displayHasContent = true; } else if (displayContent != null && (!mObscureApplicationContentOnSecondaryDisplays + || displayContent.isKeyguardAlwaysUnlocked() || (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; } if ((privateflags & PRIVATE_FLAG_SUSTAINED_PERFORMANCE_MODE) != 0) { |