am 9dba1073: Merge "Force additional layout pass after drawing" into lmp-mr1-dev

* commit '9dba10732802bf162c0098d2591aa284e55b7b5e': Force additional layout pass after drawing
2014-12-01 21:00:51 +00:00
parent e05fbd6901 9dba107328
commit 94dab3ae54
1 changed files with 3 additions and 0 deletions
--- a/services/core/java/com/android/server/wm/WindowManagerService.java
+++ b/services/core/java/com/android/server/wm/WindowManagerService.java
@@ -9539,6 +9539,9 @@ public class WindowManagerService extends IWindowManager.Stub
                                    + " interesting=" + numInteresting
                                    + " drawn=" + wtoken.numDrawnWindows);
                            wtoken.allDrawn = true;
+                            // Force an additional layout pass where WindowStateAnimator#
+                            // commitFinishDrawingLocked() will call performShowLocked().
+                            displayContent.layoutNeeded = true;
                            mH.obtainMessage(H.NOTIFY_ACTIVITY_DRAWN, wtoken.token).sendToTarget();
                        }
                    }