Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 95094d17 authored by Chong Zhang's avatar Chong Zhang
Browse files

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
parent 95cdbd6f

services/core/java/com/android/server/wm/WindowAnimator.java

+2 −2
Original line number Diff line number Diff line
@@ -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;

        }