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

Commit e6769147 authored by Pinyao Ting's avatar Pinyao Ting Committed by Android (Google) Code Review
Browse files

Merge "Disable Database overwrite upon restore"

parents e5764199 0d97f8d1

src/com/android/launcher3/Launcher.java

+1 −3
Original line number Diff line number Diff line
@@ -2343,9 +2343,7 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche 
            if (item.restoreStatus == LauncherAppWidgetInfo.RESTORE_COMPLETED) {

                // Verify that we own the widget

                if (appWidgetInfo == null) {

                    FileLog.e(TAG, "Removing invalid widget: id=" + item.appWidgetId

                            + ",title=" + item.title

                            + ",providerName=" + item.providerName.toShortString());

                    FileLog.e(TAG, "Removing invalid widget: id=" + item.appWidgetId);

                    getModelWriter().deleteWidgetInfo(item, getAppWidgetHost());

                    return null;

                }

src/com/android/launcher3/LauncherProvider.java

+0 −6
Original line number Diff line number Diff line
@@ -85,7 +85,6 @@ import java.util.Arrays; 
import java.util.Locale;

import java.util.concurrent.TimeUnit;

import java.util.function.Supplier;

import java.util.stream.Collectors;



public class LauncherProvider extends ContentProvider {

    private static final String TAG = "LauncherProvider";
@@ -932,11 +931,6 @@ public class LauncherProvider extends ContentProvider { 
            final IntSet validWidgets = IntSet.wrap(LauncherDbUtils.queryIntArray(db,

                    Favorites.TABLE_NAME, Favorites.APPWIDGET_ID,

                    "itemType=" + Favorites.ITEM_TYPE_APPWIDGET, null, null));

            final String allWidgetIds = Arrays.stream(allWidgets).mapToObj(String::valueOf)

                    .collect(Collectors.joining(","));

            final String validWidgetIds = validWidgets.getArray().toConcatString();

            FileLog.d(TAG, "All widget ids: " + allWidgetIds);

            FileLog.d(TAG, "Valid widget ids: " + validWidgetIds);

            for (int widgetId : allWidgets) {

                if (!validWidgets.contains(widgetId)) {

                    try {

src/com/android/launcher3/config/FeatureFlags.java

+1 −1
Original line number Diff line number Diff line
@@ -153,7 +153,7 @@ public final class FeatureFlags { 
            "ENABLE_OVERVIEW_CONTENT_PUSH", false, "Show Content Push button in Overview Actions");



    public static final BooleanFlag ENABLE_DATABASE_RESTORE = getDebugFlag(

            "ENABLE_DATABASE_RESTORE", true,

            "ENABLE_DATABASE_RESTORE", false,

            "Enable database restore when new restore session is created");



    public static final BooleanFlag ENABLE_SMARTSPACE_UNIVERSAL = getDebugFlag(

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

+1 −5
Original line number Diff line number Diff line
@@ -745,11 +745,7 @@ public class LoaderTask implements Runnable { 
                                            + "span=" + appWidgetInfo.spanX + "x"

                                            + appWidgetInfo.spanY + " minSpan="

                                            + widgetProviderInfo.minSpanX + "x"

                                            + widgetProviderInfo.minSpanY

                                            + ", appWidgetInfo.provider="

                                            + appWidgetInfo.providerName.toShortString()

                                            + ", widgetProviderInfo.provider="

                                            + widgetProviderInfo.provider.toShortString());

                                            + widgetProviderInfo.minSpanY);

                                    continue;

                                }

                                if (!c.isOnWorkspaceOrHotseat()) {