summaryrefslogtreecommitdiffstats
path: root/services
diff options
context:
space:
mode:
authorCraig Mautner <cmautner@google.com>2015-02-11 13:24:19 -0800
committerCraig Mautner <cmautner@google.com>2015-02-11 13:24:19 -0800
commit082500c76e82139208b3792cdbc283ef59092e16 (patch)
tree1371aed006bea76d0bb08c17d017ef01c128db0f /services
parentf9259107342559456105392e3387a3c8a1e5d6e4 (diff)
downloadframeworks_base-082500c76e82139208b3792cdbc283ef59092e16.zip
frameworks_base-082500c76e82139208b3792cdbc283ef59092e16.tar.gz
frameworks_base-082500c76e82139208b3792cdbc283ef59092e16.tar.bz2
Don't relayout based on a window that isn't visible
The method commitFinishDrawingLocked returned true even if the window it was called for was hidden. By returning the value that performShowLocked() returns it only returns true if the window is shown. Fixes bug 19100757. Change-Id: I45df70aedcb3909561fd3a19e861579a11521db9
Diffstat (limited to 'services')
-rw-r--r--services/core/java/com/android/server/wm/WindowStateAnimator.java4
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 {