diff options
| author | Craig Mautner <cmautner@google.com> | 2012-05-23 18:29:39 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-05-23 18:29:39 -0700 |
| commit | 9cf5831f2b94f5e2edd7fd87abef4e9fac8aa82d (patch) | |
| tree | 2f0aebd98228cb81631c822e37dd4c3ff1080bf7 /services | |
| parent | c1cabdfbbb5de2c286fc9a4fe995b7b630a74a0d (diff) | |
| parent | 8e4df6c1e261a5b41193b00b1c0ce0badaa84f1c (diff) | |
| download | frameworks_base-9cf5831f2b94f5e2edd7fd87abef4e9fac8aa82d.zip frameworks_base-9cf5831f2b94f5e2edd7fd87abef4e9fac8aa82d.tar.gz frameworks_base-9cf5831f2b94f5e2edd7fd87abef4e9fac8aa82d.tar.bz2 | |
Merge "Fix jank when launching apps that show wallpaper." into jb-dev
Diffstat (limited to 'services')
| -rwxr-xr-x | services/java/com/android/server/wm/WindowManagerService.java | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/services/java/com/android/server/wm/WindowManagerService.java b/services/java/com/android/server/wm/WindowManagerService.java index 895b5c1..fda3352 100755 --- a/services/java/com/android/server/wm/WindowManagerService.java +++ b/services/java/com/android/server/wm/WindowManagerService.java @@ -1636,7 +1636,7 @@ public class WindowManagerService extends IWindowManager.Stub continue; } } - if (DEBUG_WALLPAPER) Slog.v(TAG, "Win " + w + ": readyfordisplay=" + if (DEBUG_WALLPAPER) Slog.v(TAG, "Win #" + i + " " + w + ": readyfordisplay=" + w.isReadyForDisplay() + " mDrawState=" + w.mWinAnimator.mDrawState); if ((w.mAttrs.flags&FLAG_SHOW_WALLPAPER) != 0 && w.isReadyForDisplay() && (mWallpaperTarget == w || w.isDrawnLw())) { @@ -1729,12 +1729,15 @@ public class WindowManagerService extends IWindowManager.Stub Slog.v(TAG, "Old wallpaper still the target."); } mWallpaperTarget = oldW; - } - + foundW = oldW; + foundI = oldI; + mLowerWallpaperTarget = null; + mUpperWallpaperTarget = null; + } // Now set the upper and lower wallpaper targets // correctly, and make sure that we are positioning // the wallpaper below the lower. - if (foundI > oldI) { + else if (foundI > oldI) { // The new target is on top of the old one. if (DEBUG_WALLPAPER) { Slog.v(TAG, "Found target above old target."); |