Merge "[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/ThemePicker"
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();
     }