commit b3244b1985a8cc19d52be4ae6f680c2d23422cca
author Chuck Liao <chuckliao@google.com> Mon Mar 22 23:29:33 2021 +0800
committer Chuck Liao <chuckliao@google.com> Mon Mar 22 23:37:18 2021 +0800
tree 5b8fc3c613f4a4cd53d08a16a2a7a3428411791b
parent e9c206876a77cde63634c250b7650e3f85d7c72f

Fix the null pointer exception after applying a wallpaper.

Bug: 183385553
Test: Manual
Change-Id: I769dc8914281a1d393038a1afa9cb0cc989e7071

src/com/android/customization/picker/CustomizationPickerActivity.java

diff --git a/src/com/android/customization/picker/CustomizationPickerActivity.java b/src/com/android/customization/picker/CustomizationPickerActivity.java
index 5ca00c5..e198484 100644
--- a/src/com/android/customization/picker/CustomizationPickerActivity.java
+++ b/src/com/android/customization/picker/CustomizationPickerActivity.java
@@ -437,6 +437,9 @@
     @Nullable
     @Override
     public CategorySelectorFragment getCategorySelectorFragment() {
+        if (mWallpaperCategoryFragment == null) {
+            return null;
+        }
         return mWallpaperCategoryFragment.getCategorySelectorFragment();
     }