diff options
| author | 2023-06-27 10:02:56 +0000 | |
|---|---|---|
| committer | 2023-06-27 10:02:56 +0000 | |
| commit | 0976919ceb14d6f5496be9f0c7ce1ef457094834 (patch) | |
| tree | 754b01fe9ec8780069bb90951723b59309ac23e0 | |
| parent | f2c66dee859cf50eed77d1f2c6b4ade9ca10f719 (diff) | |
| parent | c255fadec8e8df45c0734cf24e7851ae5763dce8 (diff) | |
Merge "Respect always unlocked displays when keyguard is shown." into udc-dev am: 68c74f4c51 am: c255fadec8
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23692527
Change-Id: If8664eec118b2bacc1eb9351005d94f90381a903
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) { |