Merge "Don't relayout based on a window that isn't visible" into lmp-mr1-modular-dev

2015-02-11 22:27:03 +00:00
parent 33bb70d613 082500c76e
commit 18d836b618
1 changed files with 2 additions and 2 deletions
--- a/services/core/java/com/android/server/wm/WindowStateAnimator.java
+++ b/services/core/java/com/android/server/wm/WindowStateAnimator.java
@@ -542,9 +542,9 @@ class WindowStateAnimator {
        mDrawState = READY_TO_SHOW;
        final AppWindowToken atoken = mWin.mAppToken;
        if (atoken == null || atoken.allDrawn || mWin.mAttrs.type == TYPE_APPLICATION_STARTING) {
-            performShowLocked();
+            return performShowLocked();
        }
-        return true;
+        return false;
    }

    static class SurfaceTrace extends SurfaceControl {