Merge cherrypicks of [13044672, 13045117, 13045007, 13045118] into sc-release

Change-Id: Ia4978317715e764c2547b099c1717277f699e92f
This commit is contained in:
android-build-team Robot committed 2020-11-12 17:07:06 +00:00
commit cfaaa59a9a
3 files changed
+14 -2

No files matched your search

+3 -1
View File
@@ -2330,7 +2330,9 @@ 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);
FileLog.e(TAG, "Removing invalid widget: id=" + item.appWidgetId
+ ",title=" + item.title
+ ",providerName=" + item.providerName.toShortString());
getModelWriter().deleteWidgetInfo(item, getAppWidgetHost());
return null;
}
@@ -85,6 +85,7 @@ 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";
@@ -931,6 +932,11 @@ 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 {
@@ -745,7 +745,11 @@ public class LoaderTask implements Runnable {
+ "span=" + appWidgetInfo.spanX + "x"
+ appWidgetInfo.spanY + " minSpan="
+ widgetProviderInfo.minSpanX + "x"
+ widgetProviderInfo.minSpanY);
+ widgetProviderInfo.minSpanY
+ ", appWidgetInfo.provider="
+ appWidgetInfo.providerName.toShortString()
+ ", widgetProviderInfo.provider="
+ widgetProviderInfo.provider.toShortString());
continue;
}
if (!c.isOnWorkspaceOrHotseat()) {