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

Commit 435f98de authored by Jorim Jaggi's avatar Jorim Jaggi
Browse files

Also show attached windows during FLAG_SHOW_WHEN_LOCKED animations 

Since appShowWhenLocked is already null during the animation, we
also need to show the window if it's attached to a
FLAG_SHOW_WHEN_LOCKED window

Test: Test animation occluded -> lockscreen with an app that
has a SurfaceView
Fixes: 30829255

Change-Id: I0e0012bbe5679cd0894ce4d94902ff8b24823b51
parent cb3c7d3b

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

+3 −0
Original line number Diff line number Diff line
@@ -236,6 +236,9 @@ public class WindowAnimator { 
        allowWhenLocked |= (win.mIsImWindow || imeTarget == win) && showImeOverKeyguard;

        // Show SHOW_WHEN_LOCKED windows

        allowWhenLocked |= (win.mAttrs.flags & FLAG_SHOW_WHEN_LOCKED) != 0;

        // Show windows that are attached to SHOW_WHEN_LOCKED windows

        allowWhenLocked |= win.mAttachedWindow != null

                && (win.mAttachedWindow.mAttrs.flags & FLAG_SHOW_WHEN_LOCKED) != 0;



        if (appShowWhenLocked != null) {

            allowWhenLocked |= appShowWhenLocked == win.mAppToken