Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a6c2f8ab authored by Michael Jurka's avatar Michael Jurka Committed by Android Git Automerger
Browse files

am e6733963: resolved conflicts for merge of ede4d56e to jb-dev-plus-aosp 

* commit 'e6733963':
  Fix issue where static wallpaper was offset on boot
parents 4405a21a e6733963

packages/SystemUI/src/com/android/systemui/ImageWallpaper.java

+10 −3
Original line number Diff line number Diff line
@@ -281,9 +281,16 @@ public class ImageWallpaper extends WallpaperService { 
                return;

            }



            if (mBackgroundWidth < 0 || mBackgroundHeight < 0) {

            // If we don't yet know the size of the wallpaper bitmap,

            // we need to get it now.

            boolean updateWallpaper = mBackgroundWidth < 0 || mBackgroundHeight < 0 ;



            // If we somehow got to this point after we have last flushed

            // the wallpaper, well we really need it to draw again.  So

            // seems like we need to reload it.  Ouch.

            updateWallpaper = updateWallpaper || mBackground == null;



            if (updateWallpaper) {

                updateWallpaperLocked();

            }