Merge "Merge "Revert "Load and draw bitmap only once with ImageWallpaper""... (7735511d) · Commits · e / os / android_frameworks_base

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

+0 −3

Original line number	Diff line number	Diff line
		@@ -109,7 +109,6 @@ public class ImageWallpaper extends WallpaperService {
		private WallpaperManager mWallpaperManager;
		private final WallpaperLocalColorExtractor mWallpaperLocalColorExtractor;
		private SurfaceHolder mSurfaceHolder;
		private boolean mDrawn = false;
		@VisibleForTesting
		static final int MIN_SURFACE_WIDTH = 128;
		@VisibleForTesting
		@@ -240,7 +239,6 @@ public class ImageWallpaper extends WallpaperService {

		private void drawFrameSynchronized() {
		synchronized (mLock) {
		if (mDrawn) return;
		drawFrameInternal();
		}
		}
		@@ -278,7 +276,6 @@ public class ImageWallpaper extends WallpaperService {
		Rect dest = mSurfaceHolder.getSurfaceFrame();
		try {
		canvas.drawBitmap(bitmap, null, dest, null);
		mDrawn = true;
		} finally {
		surface.unlockCanvasAndPost(canvas);
		}