Merge "Fixes wallpaper thumbnails disappearing after setting wallpaper" into tm-qpr-dev

1 files changed, 3 insertions, 1 deletions

diff --git a/src/com/android/wallpaper/picker/CustomizationPickerActivity.java b/src/com/android/wallpaper/picker/CustomizationPickerActivity.java
index 1ed7272e..3f8c2d03 100644
--- a/src/com/android/wallpaper/picker/CustomizationPickerActivity.java
+++ b/src/com/android/wallpaper/picker/CustomizationPickerActivity.java
@@ -126,6 +126,9 @@ public class CustomizationPickerActivity extends FragmentActivity implements App
                     ? WallpaperOnlyFragment.newInstance(mIsUseRevampedUi)
                     : CustomizationPickerFragment.newInstance(
                             mIsUseRevampedUi, startFromLockScreen));
+
+            // Cache the categories, but only if we're not restoring state (b/276767415).
+            mDelegate.prefetchCategories();
         }
 
         if (savedInstanceState == null) {
@@ -161,7 +164,6 @@ public class CustomizationPickerActivity extends FragmentActivity implements App
                     this, deepLinkCollectionId));
             intent.setData(null);
         }
-        mDelegate.prefetchCategories();
     }
 
     @Override