commit fc4f763f7e07c4b5b9e69e402db64716b928f728
author Kunhung Li <kunhungli@google.com> Mon Jun 15 09:50:49 2020 +0800
committer Kunhung Li <kunhungli@google.com> Wed Jun 17 00:09:39 2020 +0000
tree e685d2599a449bce3fc35151f7b1cc6c4d2de58e
parent 90b4522248e7bd3689f632522594e5ab9cf64a77

Fix applying live wallpaper keep stopping

After applying the live wallpaper, the device will show Styles &
wallpapers keeps stopping.

NullPointerException: Attempt to invoke virtual method
'android.widget.ImageView.getDrawable()' on a null object reference

Add null check to skip loadPreviewImage().

Bug: 158814822
Test: Manual
Change-Id: I560fac06c2b3be179b399eba9f58db97f9ffc4ba

src/com/android/wallpaper/picker/CategoryFragment.java

diff --git a/src/com/android/wallpaper/picker/CategoryFragment.java b/src/com/android/wallpaper/picker/CategoryFragment.java
index f0b4713..5cf612c 100755
--- a/src/com/android/wallpaper/picker/CategoryFragment.java
+++ b/src/com/android/wallpaper/picker/CategoryFragment.java
@@ -676,16 +676,21 @@
 
         boolean renderInImageWallpaperSurface =
                 !(wallpaperInfo instanceof LiveWallpaperInfo) && isHomeWallpaper;
-        wallpaperInfo.getThumbAsset(activity.getApplicationContext())
-                .loadPreviewImage(activity,
-                        renderInImageWallpaperSurface ? mHomeImageWallpaper : thumbnailView,
-                        getResources().getColor(R.color.secondary_color));
+        ImageView imageView = renderInImageWallpaperSurface ? mHomeImageWallpaper : thumbnailView;
+        if (imageView != null) {
+            wallpaperInfo.getThumbAsset(activity.getApplicationContext())
+                    .loadPreviewImage(activity, imageView,
+                            getResources().getColor(R.color.secondary_color));
+        }
+
         if (isHomeWallpaper) {
             LiveTileOverlay.INSTANCE.detach(thumbnailView.getOverlay());
             if (wallpaperInfo instanceof LiveWallpaperInfo) {
-                wallpaperInfo.getThumbAsset(activity.getApplicationContext()).loadPreviewImage(
-                        activity, mHomeImageWallpaper,
-                        getResources().getColor(R.color.secondary_color));
+                if(mHomeImageWallpaper != null) {
+                    wallpaperInfo.getThumbAsset(activity.getApplicationContext()).loadPreviewImage(
+                            activity, mHomeImageWallpaper,
+                            getResources().getColor(R.color.secondary_color));
+                }
                 setUpLiveWallpaperPreview(wallpaperInfo);
             } else {
                 if (mWallpaperConnection != null) {