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

Fix waitingForDrawn callback not called when adjusting for IME

Browse Source 
Test: Go into multi-window, with IME target at the top. Open IME,
lock screen and immediately unlock with fingerprint. Make sure
you don't end up with a unrecoverable black screen.

Change-Id: I1b9dd3aab64454e2d2894f5f273b70385615c74f
Fixes: 32544627
This commit is contained in:
Jorim Jaggi
2016-11-04 15:45:30 -07:00
parent 0c94d19c5d
commit 3188386ff8
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/core/java/com/android/server/wm/DockedStackDividerController.java
View File

@@ -658,6 +658,14 @@ public class DockedStackDividerController implements DimLayerUser {
mDelayedImeWin = imeWin; mDelayedImeWin = imeWin;
imeWin.mWinAnimator.startDelayingAnimationStart(); imeWin.mWinAnimator.startDelayingAnimationStart();
} }
// If we are already waiting for something to be drawn, clear out the old one so it
// still gets executed.
// TODO: Have a real system where we can wait on different windows to be drawn with
// different callbacks.
if (mService.mWaitingForDrawnCallback != null) {
mService.mWaitingForDrawnCallback.run();
}
mService.mWaitingForDrawnCallback = () -> { mService.mWaitingForDrawnCallback = () -> {
mAnimationStartDelayed = false; mAnimationStartDelayed = false;
if (mDelayedImeWin != null) { if (mDelayedImeWin != null) {