commit 53c6343372c6b4ba1b60a8dc016ca4298e04c6a8
author Santiago Etchebehere <santie@google.com> Thu May 07 18:55:35 2020 -0700
committer Santiago Etchebehere <santie@google.com> Fri May 08 11:48:23 2020 -0700
tree 076077fc674ade93175529a321330739f1af08a6
parent 2a06c0b6741da1b78c9909d0a604235af807af3f

Workaround for crash in GradientDrawable

When cornerRadii is null, GradientDrawable#getCornerRadii() throws NPE
instead of returning null.

Fixes: 156035955
Change-Id: Id606fc8e46b4c44d4dbff3ec28680d7a5b8f5cb9

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

diff --git a/src/com/android/wallpaper/picker/CategorySelectorFragment.java b/src/com/android/wallpaper/picker/CategorySelectorFragment.java
index 4094cda..733aeb1 100644
--- a/src/com/android/wallpaper/picker/CategorySelectorFragment.java
+++ b/src/com/android/wallpaper/picker/CategorySelectorFragment.java
@@ -46,7 +46,7 @@
 import com.android.wallpaper.module.InjectorProvider;
 import com.android.wallpaper.module.UserEventLogger;
 import com.android.wallpaper.util.DisplayMetricsRetriever;
-import com.android.wallpaper.util.TileSizeCalculator;
+import com.android.wallpaper.util.SizeCalculator;
 
 import com.bumptech.glide.Glide;
 
@@ -104,7 +104,7 @@
         mImageGrid.addItemDecoration(new GridPaddingDecoration(
                 getResources().getDimensionPixelSize(R.dimen.grid_padding)));
 
-        mTileSizePx = TileSizeCalculator.getCategoryTileSize(getActivity());
+        mTileSizePx = SizeCalculator.getCategoryTileSize(getActivity());
 
         mImageGrid.setAdapter(mAdapter);
 
@@ -184,7 +184,7 @@
 
     private int getNumColumns() {
         Activity activity = getActivity();
-        return activity == null ? 0 : TileSizeCalculator.getNumCategoryColumns(activity);
+        return activity == null ? 0 : SizeCalculator.getNumCategoryColumns(activity);
     }