commit 0c8a38d1810879539a27ca017695d92296f8fbff
author Jeremy Sim <jeremysim@google.com> Thu Dec 21 00:07:47 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Dec 21 00:07:47 2023 +0000
tree db4100ffd2dd73a7ce0f28390ff60bc21682ead8
parent 716f982d44d8361dd34dbd1266bf1d9545bf5d3e
parent ee596789de26b12a5a6063fedb5912399e6102e4

Merge "Fix crash with app pairs and grid migration" into main

src/com/android/launcher3/model/GridSizeMigrationUtil.java

diff --git a/src/com/android/launcher3/model/GridSizeMigrationUtil.java b/src/com/android/launcher3/model/GridSizeMigrationUtil.java
index efd5574..af66431 100644
--- a/src/com/android/launcher3/model/GridSizeMigrationUtil.java
+++ b/src/com/android/launcher3/model/GridSizeMigrationUtil.java
@@ -262,7 +262,8 @@
             String srcTableName, String destTableName) {
         int id = copyEntryAndUpdate(helper, entry, srcTableName, destTableName);
 
-        if (entry.itemType == LauncherSettings.Favorites.ITEM_TYPE_FOLDER) {
+        if (entry.itemType == LauncherSettings.Favorites.ITEM_TYPE_FOLDER
+                || entry.itemType == LauncherSettings.Favorites.ITEM_TYPE_APP_PAIR) {
             for (Set<Integer> itemIds : entry.mFolderItems.values()) {
                 for (int itemId : itemIds) {
                     copyEntryAndUpdate(helper, itemId, id, srcTableName, destTableName);