From 1a835b1bcf20a6cbbf50deeb19fd205b4268efa7 Mon Sep 17 00:00:00 2001
From: Christoph Studer <chstuder@google.com>
Date: Fri, 28 Feb 2014 15:57:18 +0100
Subject: Guard against null default wallpaper

Deal with WallpaperManager.getBuiltInDrawable() returning null.

Bug: 13109487
Change-Id: Ib5665a0eb947e9784cdcd0e8dfab1a01b4deca82
---
 .../android/launcher3/WallpaperPickerActivity.java | 24 ++++++++++++++--------
 1 file changed, 15 insertions(+), 9 deletions(-)

(limited to 'WallpaperPicker/src/com')

diff --git a/WallpaperPicker/src/com/android/launcher3/WallpaperPickerActivity.java b/WallpaperPicker/src/com/android/launcher3/WallpaperPickerActivity.java
index 0070add2a..93967ad5d 100644
--- a/WallpaperPicker/src/com/android/launcher3/WallpaperPickerActivity.java
+++ b/WallpaperPicker/src/com/android/launcher3/WallpaperPickerActivity.java
@@ -16,7 +16,6 @@
 
 package com.android.launcher3;
 
-import android.animation.Animator;
 import android.animation.LayoutTransition;
 import android.app.ActionBar;
 import android.app.Activity;
@@ -33,7 +32,6 @@ import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.graphics.Canvas;
 import android.graphics.Matrix;
-import android.graphics.Paint;
 import android.graphics.Point;
 import android.graphics.PorterDuff;
 import android.graphics.Rect;
@@ -252,6 +250,12 @@ public class WallpaperPickerActivity extends WallpaperCropActivity {
             Drawable defaultWallpaper = WallpaperManager.getInstance(a).getBuiltInDrawable(
                     c.getWidth(), c.getHeight(), false, 0.5f, 0.5f);
 
+            if (defaultWallpaper == null) {
+                Log.w(TAG, "Null default wallpaper encountered.");
+                c.setTileSource(null, null);
+                return;
+            }
+
             c.setTileSource(
                     new DrawableTileSource(a, defaultWallpaper, DrawableTileSource.MAX_PREVIEW_SIZE), null);
             c.setScale(1f);
@@ -424,13 +428,15 @@ public class WallpaperPickerActivity extends WallpaperCropActivity {
         // Add a tile for the default wallpaper
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
             DefaultWallpaperInfo defaultWallpaperInfo = getDefaultWallpaper();
-            FrameLayout defaultWallpaperTile = (FrameLayout) createImageTileView(
-                    getLayoutInflater(), 0, null, mWallpapersView, defaultWallpaperInfo.mThumb);
-            setWallpaperItemPaddingToZero(defaultWallpaperTile);
-            defaultWallpaperTile.setTag(defaultWallpaperInfo);
-            mWallpapersView.addView(defaultWallpaperTile, 0);
-            defaultWallpaperTile.setOnClickListener(mThumbnailOnClickListener);
-            defaultWallpaperInfo.setView(defaultWallpaperTile);
+            if (defaultWallpaperInfo != null) {
+                FrameLayout defaultWallpaperTile = (FrameLayout) createImageTileView(
+                        getLayoutInflater(), 0, null, mWallpapersView, defaultWallpaperInfo.mThumb);
+                setWallpaperItemPaddingToZero(defaultWallpaperTile);
+                defaultWallpaperTile.setTag(defaultWallpaperInfo);
+                mWallpapersView.addView(defaultWallpaperTile, 0);
+                defaultWallpaperTile.setOnClickListener(mThumbnailOnClickListener);
+                defaultWallpaperInfo.setView(defaultWallpaperTile);
+            }
         }
 
         // Select the first item; wait for a layout pass so that we initialize the dimensions of
-- 
cgit v1.2.3