From 95094d17cbd8d4e808c3f63341f3c8c92ee8e75f Mon Sep 17 00:00:00 2001 From: Chong Zhang Date: Mon, 23 Nov 2015 16:41:38 -0800 Subject: [PATCH] Show all windows with FLAG_SHOW_WHEN_LOCKED over lock screen if we're already showing some app over the lock screen. bug: 25685940 Change-Id: Ib7869f58e2903199470a95dfb796d063bc8d0c51 --- services/core/java/com/android/server/wm/WindowAnimator.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/services/core/java/com/android/server/wm/WindowAnimator.java b/services/core/java/com/android/server/wm/WindowAnimator.java index 46fab2ae02238..f20c4e51a1bf1 100644 --- a/services/core/java/com/android/server/wm/WindowAnimator.java +++ b/services/core/java/com/android/server/wm/WindowAnimator.java @@ -220,8 +220,8 @@ public class WindowAnimator { if (appShowWhenLocked != null) { allowWhenLocked |= appShowWhenLocked == win.mAppToken - // Show all SHOW_WHEN_LOCKED windows while they're animating - || (win.mAttrs.flags & FLAG_SHOW_WHEN_LOCKED) != 0 && win.isAnimatingLw() + // Show all SHOW_WHEN_LOCKED windows if some apps are shown over lockscreen + || (win.mAttrs.flags & FLAG_SHOW_WHEN_LOCKED) != 0 // Show error dialogs over apps that dismiss keyguard. || (win.mAttrs.privateFlags & PRIVATE_FLAG_SYSTEM_ERROR) != 0; }