Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0c8a38d1 authored by Jeremy Sim's avatar Jeremy Sim Committed by Android (Google) Code Review
Browse files

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

parents 716f982d ee596789

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

+2 −1
Original line number Diff line number Diff line
@@ -262,7 +262,8 @@ public class GridSizeMigrationUtil { 
            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);