commit 0f91642464bb1172d7a7e82e2e0ff5794e0063d2
author Chuck Liao <chuckliao@google.com> Mon Mar 22 22:24:17 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Mar 22 22:24:17 2021 +0000
tree 5b8fc3c613f4a4cd53d08a16a2a7a3428411791b
parent 28e36b0b67a093acf9e8e0386986f5f28927f67b
parent b3244b1985a8cc19d52be4ae6f680c2d23422cca

Fix the null pointer exception after applying a wallpaper. am: b3244b1985

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/ThemePicker/+/13946209

Change-Id: I88cac8ffe85e57b70feb654562c26a081cf6a3bf

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();
     }