commit 6ed218bad1c01449d8648cf5acb1466795d2f96a
author Chet Haase <chet@google.com> Wed Sep 24 18:41:06 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Sep 24 18:41:06 2014 +0000
tree 972e4f4de1e04ad09ae7915fe2f298581b0b469d
parent 85e8131f0d1c8d8063698c2e64d69ba6aa8aa60d
parent ee9d415f9bf534b542141be6db075eb192ea7a27

am 66287788: Merge "Avoid drawing the starting window twice" into lmp-dev

* commit '66287788d35687a140df10ac96646cdf04f91a88':
  Avoid drawing the starting window twice

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

diff --git a/services/core/java/com/android/server/wm/WindowState.java b/services/core/java/com/android/server/wm/WindowState.java
index 0baa2be..b4a7f04 100644
--- a/services/core/java/com/android/server/wm/WindowState.java
+++ b/services/core/java/com/android/server/wm/WindowState.java
@@ -1373,7 +1373,8 @@
             final Rect stableInsets = mLastStableInsets;
             final boolean reportDraw = mWinAnimator.mDrawState == WindowStateAnimator.DRAW_PENDING;
             final Configuration newConfig = configChanged ? mConfiguration : null;
-            if (mClient instanceof IWindow.Stub) {
+            if (mAttrs.type != WindowManager.LayoutParams.TYPE_APPLICATION_STARTING
+                    && mClient instanceof IWindow.Stub) {
                 // To prevent deadlock simulate one-way call if win.mClient is a local object.
                 mService.mH.post(new Runnable() {
                     @Override