resolved conflicts for merge of acb5f383 to jb-dev-plus-aosp (e7339d80) · Commits · e / os / android_frameworks_base

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

+7 −7

Original line number	Diff line number	Diff line
		@@ -287,6 +287,13 @@ public class ImageWallpaper extends WallpaperService {
		updateWallpaperLocked();
		}

		if (mBackground == null) {
		// 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.
		updateWallpaperLocked();
		}

		SurfaceHolder sh = getSurfaceHolder();
		final Rect frame = sh.getSurfaceFrame();
		final int dw = frame.width();
		@@ -308,13 +315,6 @@ public class ImageWallpaper extends WallpaperService {
		mLastXTranslation = xPixels;
		mLastYTranslation = yPixels;

		if (mBackground == null) {
		// 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.
		updateWallpaperLocked();
		}

		if (mIsHwAccelerated) {
		if (!drawWallpaperWithOpenGL(sh, availw, availh, xPixels, yPixels)) {
		drawWallpaperWithCanvas(sh, availw, availh, xPixels, yPixels);