Merge "Revert "Load and draw bitmap only once with ImageWallpaper"" into udc-qpr-dev (c584d175) · Commits · e / os / android_frameworks_base

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

+0 −3

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

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