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

Commit e6733963 authored by Michael Jurka's avatar Michael Jurka
Browse files

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

Change-Id: I8893e819f0f814a1fe1e0fb7f70dba860e889135
parents 5558f66e ede4d56e

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();

            }