diff options
| author | Craig Mautner <cmautner@google.com> | 2015-02-11 23:24:07 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-02-11 23:24:07 +0000 |
| commit | ae0fdaf5e864ab755e54243006e7116fbb375a7b (patch) | |
| tree | df46fa4ee5b7a363579b67e53b67897f998f5c92 | |
| parent | e29c45adda7496612dd85e487d2b6917efd3e30e (diff) | |
| parent | 3d576cc643497e5a4f0285dea75b7ba5e964009c (diff) | |
| download | frameworks_base-ae0fdaf5e864ab755e54243006e7116fbb375a7b.zip frameworks_base-ae0fdaf5e864ab755e54243006e7116fbb375a7b.tar.gz frameworks_base-ae0fdaf5e864ab755e54243006e7116fbb375a7b.tar.bz2 | |
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
| -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 8202880..8c79cf0 100644 --- 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 { |