Merge "WallpaperCropper: do not display null bitmaps" into cm-11.0 (cf481de2) · Commits · e / os / android_frameworks_base

packages/WallpaperCropper/src/com/android/wallpapercropper/LockWallpaperPickerActivity.java

+14 −12

Original line number	Diff line number	Diff line
		@@ -1337,10 +1337,11 @@ public class LockWallpaperPickerActivity extends WallpaperCropActivity {
		boolean isLegacy = c.getInt(c.getColumnIndexOrThrow(
		ThemesColumns.IS_LEGACY_THEME)) == 1;
		bmp = getThemeWallpaper(this, "wallpapers", pkgName, isLegacy, true /* thumb*/);
		if (bmp != null) {
		themeWallpapers.add(
		new ThemeWallpaperInfo(this, pkgName, isLegacy,
		new BitmapDrawable(getResources(), bmp)));
		if (bmp != null) {

		Log.d("", String.format("Loaded bitmap of size %dx%d for %s",
		bmp.getWidth(), bmp.getHeight(), pkgName));
		}
		@@ -1366,10 +1367,11 @@ public class LockWallpaperPickerActivity extends WallpaperCropActivity {
		while (c.moveToNext()) {
		String pkgName = c.getString(c.getColumnIndexOrThrow(ThemesColumns.PKG_NAME));
		bmp = getThemeWallpaper(this, "lockscreen", pkgName, false, true /* thumb*/);
		if (bmp != null) {
		themeWallpapers.add(
		new ThemeLockWallpaperInfo(this, pkgName,
		new BitmapDrawable(getResources(), bmp)));
		if (bmp != null) {

		Log.d("", String.format("Loaded bitmap of size %dx%d for %s",
		bmp.getWidth(), bmp.getHeight(), pkgName));
		}