diff options
| author | Craig Mautner <cmautner@google.com> | 2015-02-11 23:04:12 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-02-11 23:04:12 +0000 |
| commit | 3d576cc643497e5a4f0285dea75b7ba5e964009c (patch) | |
| tree | 3fb308770ac252f817e2b2b310ed40957c8132e9 /services | |
| parent | 33d3c53da021f0d044028860ace0f4ad817273f5 (diff) | |
| parent | 18d836b61811270bfae8cec6e0e782234dfcf5a4 (diff) | |
| download | frameworks_base-3d576cc643497e5a4f0285dea75b7ba5e964009c.zip frameworks_base-3d576cc643497e5a4f0285dea75b7ba5e964009c.tar.gz frameworks_base-3d576cc643497e5a4f0285dea75b7ba5e964009c.tar.bz2 | |
am 18d836b6: Merge "Don\'t relayout based on a window that isn\'t visible" into lmp-mr1-modular-dev
* commit '18d836b61811270bfae8cec6e0e782234dfcf5a4':
Don't relayout based on a window that isn't visible
Diffstat (limited to 'services')
| -rw-r--r-- | services/core/java/com/android/server/wm/WindowStateAnimator.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/services/core/java/com/android/server/wm/WindowStateAnimator.java b/services/core/java/com/android/server/wm/WindowStateAnimator.java index c2d8004..4cdfc41 100644 --- 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 { |