am 19fa2122: am 6bd7603a: Merge "Force the wallpaper to reload when dimensions change" into klp-dev

* commit '19fa212251542ac8f24ec0b24316bb08417cb44e': Force the wallpaper to reload when dimensions change
2013-10-15 17:15:35 -07:00
parent 754fee0a23 19fa212251
commit ee3674a01b
2 changed files with 2 additions and 0 deletions
--- a/core/java/android/app/WallpaperManager.java
+++ b/core/java/android/app/WallpaperManager.java
@ -280,6 +280,7 @@ public class WallpaperManager {
            synchronized (this) {
                mWallpaper = null;
                mDefaultWallpaper = null;
+                mHandler.removeMessages(MSG_CLEAR_WALLPAPER);
            }
        }

--- a/packages/SystemUI/src/com/android/systemui/ImageWallpaper.java
+++ b/packages/SystemUI/src/com/android/systemui/ImageWallpaper.java
@ -326,6 +326,7 @@ public class ImageWallpaper extends WallpaperService {
                            ((mBackground == null) ? 0 : mBackground.getHeight()) + ", " +
                            dw + ", " + dh);
                }
+                mWallpaperManager.forgetLoadedWallpaper();
                updateWallpaperLocked();
                if (mBackground == null) {
                    if (DEBUG) {