Merge "1. Get rid of mWidgetMinSize as the contents of this collection are...

import android.net.Uri;

import android.text.TextUtils;

import android.util.Log;

import com.android.launcher3.InvariantDeviceProfile;

import com.android.launcher3.ItemInfo;

import com.android.launcher3.LauncherAppState;

import com.android.launcher3.config.FeatureFlags;

import com.android.launcher3.util.GridOccupancy;

import com.android.launcher3.util.LongArrayMap;

import java.util.ArrayList;

import java.util.Collections;

import java.util.HashMap;

import java.util.HashSet;

import java.util.Locale;

    private final Context mContext;

    private final InvariantDeviceProfile mIdp;

    private final HashMap<String, Point> mWidgetMinSize = new HashMap<>();

    private final ContentValues mTempValues = new ContentValues();

    protected final ArrayList<Long> mEntryToRemove = new ArrayList<>();

    private final ArrayList<ContentProviderOperation> mUpdateOperations = new ArrayList<>();

                        int widgetId = c.getInt(indexAppWidgetId);

                        LauncherAppWidgetProviderInfo pInfo = AppWidgetManagerCompat.getInstance(

                                mContext).getLauncherAppWidgetInfo(widgetId);

                        Point spans = pInfo == null ?

                                mWidgetMinSize.get(provider) : pInfo.getMinSpans(mIdp, mContext);

                        Point spans = null;

                        if (pInfo != null) {

                            spans = pInfo.getMinSpans(mIdp, mContext);

                        }

                        if (spans != null) {

                            entry.minSpanX = spans.x > 0 ? spans.x : entry.spanX;

                            entry.minSpanY = spans.y > 0 ? spans.y : entry.spanY;

    }

    private static ArrayList<DbEntry> deepCopy(ArrayList<DbEntry> src) {

        ArrayList<DbEntry> dup = new ArrayList<DbEntry>(src.size());

        ArrayList<DbEntry> dup = new ArrayList<>(src.size());

        for (DbEntry e : src) {

            dup.add(e.copy());

        }

        try {

            boolean dbChanged = false;

            HashSet validPackages = getValidPackages(context);

            HashSet<String> validPackages = getValidPackages(context);

            // Hotseat

            int srcHotseatCount = prefs.getInt(KEY_MIGRATION_SRC_HOTSEAT_COUNT, idp.numHotseatIcons);

            if (srcHotseatCount != idp.numHotseatIcons) {

        // this set is removed.

        // Since the loader removes such items anyway, removing these items here doesn't cause

        // any extra data loss and gives us more free space on the grid for better migration.

        HashSet validPackages = new HashSet<>();

        HashSet<String> validPackages = new HashSet<>();

        for (PackageInfo info : context.getPackageManager()

                .getInstalledPackages(PackageManager.GET_UNINSTALLED_PACKAGES)) {

            validPackages.add(info.packageName);