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

* commit '94dab3ae5468e2c6325b47aa633d08dc7727198b': Force additional layout pass after drawing
2014-12-01 21:06:36 +00:00
parent ea64d0beea 94dab3ae54
commit b62b1b0379
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
@@ -9564,6 +9564,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();
                        }
                    }