am 3d576cc6: am 18d836b6: Merge "Don\'t relayout based on a window that isn\'t visible" into lmp-mr1-modular-dev

* commit '3d576cc643497e5a4f0285dea75b7ba5e964009c': Don't relayout based on a window that isn't visible
2015-02-11 23:24:07 +00:00
parent e29c45adda 3d576cc643
commit ae0fdaf5e8
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
@@ -538,9 +538,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 {