Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Also show attached windows during FLAG_SHOW_WHEN_LOCKED animations

Browse Source 
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
This commit is contained in:
Jorim Jaggi
2016-08-30 19:55:32 -07:00
parent cb3c7d3b0e
commit 435f98de83
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/core/java/com/android/server/wm/WindowAnimator.java
View File

@@ -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