From 302eff9c84cd8d9e2b41e69d3feeff3925936d3d Mon Sep 17 00:00:00 2001
From: Tony Wickham <twickham@google.com>
Date: Tue, 7 Sep 2021 12:03:07 -0700
Subject: [PATCH] Fix wallpaper picker crash if folder is in hotseat

Only use mWorkspaceScreens if info.container == CONTAINER_DESKTOP, otherwise assume it's in mHotseat instead.

Test: have a folder in hotseat, open wallpaper picker and can see the preview and set wallpaper
Fixes: 199179718
Change-Id: I6f1dbd8dc387783bb8b76e2bc469508c079a85f8
---
 .../android/launcher3/graphics/LauncherPreviewRenderer.java   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/com/android/launcher3/graphics/LauncherPreviewRenderer.java b/src/com/android/launcher3/graphics/LauncherPreviewRenderer.java
index 43ac8f98d1..7a8b5d8687 100644
--- a/src/com/android/launcher3/graphics/LauncherPreviewRenderer.java
+++ b/src/com/android/launcher3/graphics/LauncherPreviewRenderer.java
@@ -324,7 +324,9 @@ public class LauncherPreviewRenderer extends ContextWrapper
     }
 
     private void inflateAndAddFolder(FolderInfo info) {
-        CellLayout screen = mWorkspaceScreens.get(info.screenId);
+        CellLayout screen = info.container == Favorites.CONTAINER_DESKTOP
+                ? mWorkspaceScreens.get(info.screenId)
+                : mHotseat;
         FolderIcon folderIcon = FolderIcon.inflateIcon(R.layout.folder_icon, this, screen,
                 info);
         addInScreenFromBind(folderIcon, info);