From f1a292495c13c04f2e2eb3c574943c1915baaad7 Mon Sep 17 00:00:00 2001 From: MrSluffy Date: Wed, 18 Dec 2024 11:47:38 +0800 Subject: [PATCH] clean-up migrated back to collect to list for lower v --- .../launcher3/WidgetPickerActivity.java | 10 ++++++---- .../taskbar/TaskbarActivityContext.java | 4 +++- .../taskbar/bubbles/BubbleBarController.java | 4 +++- .../bubbles/BubbleBarViewController.java | 4 +++- .../LauncherRestoreEventLoggerImpl.kt | 20 +++++++++++-------- .../android/quickstep/RemoteTargetGluer.java | 6 ++++-- .../quickstep/util/AppPairsController.java | 6 ++++-- .../celllayout/ReorderAlgorithm.java | 17 +++++----------- .../launcher3/icons/ShortcutCachingLogic.java | 6 ++---- .../launcher3/model/BaseLauncherBinder.java | 9 +-------- .../launcher3/model/ModelTaskController.kt | 8 +------- .../android/launcher3/model/WidgetsModel.java | 7 +------ .../launcher3/provider/RestoreDbTask.java | 4 +++- .../picker/WidgetRecommendationsView.java | 4 +++- .../WidgetsRecommendationTableLayout.java | 3 ++- .../widget/util/WidgetsTableUtils.java | 6 +----- .../android/app/viewcapture/ViewCapture.java | 8 +++++--- .../wm/shell/bubbles/BubbleController.java | 2 +- 18 files changed, 60 insertions(+), 68 deletions(-) diff --git a/quickstep/src/com/android/launcher3/WidgetPickerActivity.java b/quickstep/src/com/android/launcher3/WidgetPickerActivity.java index 943c08c786..a9f7c2a441 100644 --- a/quickstep/src/com/android/launcher3/WidgetPickerActivity.java +++ b/quickstep/src/com/android/launcher3/WidgetPickerActivity.java @@ -143,10 +143,12 @@ public class WidgetPickerActivity extends BaseActivity { if (uiSurfaceParam != null && UI_SURFACE_PATTERN.matcher(uiSurfaceParam).matches()) { mUiSurface = uiSurfaceParam; } - ArrayList addedWidgets = getIntent().getParcelableArrayListExtra( - EXTRA_ADDED_APP_WIDGETS, AppWidgetProviderInfo.class); - if (addedWidgets != null) { - mAddedWidgets = addedWidgets; + if (Utilities.ATLEAST_T) { + ArrayList addedWidgets = getIntent().getParcelableArrayListExtra( + EXTRA_ADDED_APP_WIDGETS, AppWidgetProviderInfo.class); + if (addedWidgets != null) { + mAddedWidgets = addedWidgets; + } } } diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarActivityContext.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarActivityContext.java index d332e5e62c..4e8034da63 100644 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarActivityContext.java +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarActivityContext.java @@ -43,6 +43,8 @@ import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_N import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_VOICE_INTERACTION_WINDOW_SHOWING; import static com.android.wm.shell.Flags.enableTinyTaskbar; +import static java.util.stream.Collectors.toList; + import android.animation.AnimatorSet; import android.animation.ValueAnimator; import android.app.ActivityOptions; @@ -1258,7 +1260,7 @@ public class TaskbarActivityContext extends BaseTaskbarContext { boolean isLaunchingAppPair = itemInfos.size() == 2; // Convert the list of ItemInfo instances to a list of ComponentKeys - List componentKeys = itemInfos.stream().map(ItemInfo::getComponentKey).toList(); + List componentKeys = itemInfos.stream().map(ItemInfo::getComponentKey).collect(toList()); recents.getSplitSelectController().findLastActiveTasksAndRunCallback( componentKeys, isLaunchingAppPair, diff --git a/quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleBarController.java b/quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleBarController.java index 707ab8f1d6..87b99ff955 100644 --- a/quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleBarController.java +++ b/quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleBarController.java @@ -31,6 +31,8 @@ import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_Q import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_STATUS_BAR_KEYGUARD_SHOWING; import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_STATUS_BAR_KEYGUARD_SHOWING_OCCLUDED; +import static java.util.stream.Collectors.toList; + import android.annotation.BinderThread; import android.annotation.Nullable; import android.app.Notification; @@ -398,7 +400,7 @@ public class BubbleBarController extends IBubblesListener.Stub { if (update.bubbleKeysInOrder != null && !update.bubbleKeysInOrder.isEmpty()) { // Create the new list List newOrder = update.bubbleKeysInOrder.stream() - .map(mBubbles::get).filter(Objects::nonNull).toList(); + .map(mBubbles::get).filter(Objects::nonNull).collect(toList()); if (!newOrder.isEmpty()) { mBubbleBarViewController.reorderBubbles(newOrder); } diff --git a/quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleBarViewController.java b/quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleBarViewController.java index 393f58a043..8e25c5c5d1 100644 --- a/quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleBarViewController.java +++ b/quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleBarViewController.java @@ -18,6 +18,8 @@ package com.android.launcher3.taskbar.bubbles; import static android.view.View.INVISIBLE; import static android.view.View.VISIBLE; +import static java.util.stream.Collectors.toList; + import android.content.res.Resources; import android.graphics.Point; import android.graphics.PointF; @@ -463,7 +465,7 @@ public class BubbleBarViewController { */ public void reorderBubbles(List newOrder) { List viewList = newOrder.stream().filter(Objects::nonNull) - .map(BubbleBarBubble::getView).toList(); + .map(BubbleBarBubble::getView).collect(toList()); mBarView.reorder(viewList); } diff --git a/quickstep/src/com/android/quickstep/LauncherRestoreEventLoggerImpl.kt b/quickstep/src/com/android/quickstep/LauncherRestoreEventLoggerImpl.kt index 27bd03d4dd..9216e57579 100644 --- a/quickstep/src/com/android/quickstep/LauncherRestoreEventLoggerImpl.kt +++ b/quickstep/src/com/android/quickstep/LauncherRestoreEventLoggerImpl.kt @@ -7,6 +7,7 @@ import android.app.backup.BackupRestoreEventLogger.BackupRestoreError import android.content.Context import com.android.launcher3.Flags.enableLauncherBrMetricsFixed import com.android.launcher3.LauncherSettings.Favorites +import com.android.launcher3.Utilities import com.android.launcher3.backuprestore.LauncherRestoreEventLogger /** @@ -29,8 +30,11 @@ class LauncherRestoreEventLoggerImpl(val context: Context) : LauncherRestoreEven @BackupRestoreDataType private const val DATA_TYPE_APP_PAIR = "app_pair" } - private val restoreEventLogger: BackupRestoreEventLogger = + private val restoreEventLogger: BackupRestoreEventLogger? = if (Utilities.ATLEAST_S) { BackupManager(context).delayedRestoreLogger + } else { + null + } /** * For logging when multiple items of a given data type failed to restore. @@ -45,7 +49,7 @@ class LauncherRestoreEventLoggerImpl(val context: Context) : LauncherRestoreEven @BackupRestoreError error: String? ) { if (enableLauncherBrMetricsFixed()) { - restoreEventLogger.logItemsRestoreFailed(dataType, count, error) + restoreEventLogger?.logItemsRestoreFailed(dataType, count, error) } } @@ -57,7 +61,7 @@ class LauncherRestoreEventLoggerImpl(val context: Context) : LauncherRestoreEven */ override fun logLauncherItemsRestored(@BackupRestoreDataType dataType: String, count: Int) { if (enableLauncherBrMetricsFixed()) { - restoreEventLogger.logItemsRestored(dataType, count) + restoreEventLogger?.logItemsRestored(dataType, count) } } @@ -68,7 +72,7 @@ class LauncherRestoreEventLoggerImpl(val context: Context) : LauncherRestoreEven */ override fun logSingleFavoritesItemRestored(favoritesId: Int) { if (enableLauncherBrMetricsFixed()) { - restoreEventLogger.logItemsRestored(favoritesIdToDataType(favoritesId), 1) + restoreEventLogger?.logItemsRestored(favoritesIdToDataType(favoritesId), 1) } } @@ -80,7 +84,7 @@ class LauncherRestoreEventLoggerImpl(val context: Context) : LauncherRestoreEven */ override fun logFavoritesItemsRestored(favoritesId: Int, count: Int) { if (enableLauncherBrMetricsFixed()) { - restoreEventLogger.logItemsRestored(favoritesIdToDataType(favoritesId), count) + restoreEventLogger?.logItemsRestored(favoritesIdToDataType(favoritesId), count) } } @@ -95,7 +99,7 @@ class LauncherRestoreEventLoggerImpl(val context: Context) : LauncherRestoreEven @BackupRestoreError error: String? ) { if (enableLauncherBrMetricsFixed()) { - restoreEventLogger.logItemsRestoreFailed(favoritesIdToDataType(favoritesId), 1, error) + restoreEventLogger?.logItemsRestoreFailed(favoritesIdToDataType(favoritesId), 1, error) } } @@ -112,7 +116,7 @@ class LauncherRestoreEventLoggerImpl(val context: Context) : LauncherRestoreEven @BackupRestoreError error: String? ) { if (enableLauncherBrMetricsFixed()) { - restoreEventLogger.logItemsRestoreFailed( + restoreEventLogger?.logItemsRestoreFailed( favoritesIdToDataType(favoritesId), count, error @@ -125,7 +129,7 @@ class LauncherRestoreEventLoggerImpl(val context: Context) : LauncherRestoreEven * done restoring items for Launcher. */ override fun reportLauncherRestoreResults() { - if (enableLauncherBrMetricsFixed()) { + if (enableLauncherBrMetricsFixed() && restoreEventLogger != null) { BackupManager(context).reportDelayedRestoreResult(restoreEventLogger) } } diff --git a/quickstep/src/com/android/quickstep/RemoteTargetGluer.java b/quickstep/src/com/android/quickstep/RemoteTargetGluer.java index 3dec381b04..a9da63f480 100644 --- a/quickstep/src/com/android/quickstep/RemoteTargetGluer.java +++ b/quickstep/src/com/android/quickstep/RemoteTargetGluer.java @@ -19,6 +19,8 @@ package com.android.quickstep; import static com.android.quickstep.util.SplitScreenUtils.convertShellSplitBoundsToLauncher; import static com.android.wm.shell.util.SplitBounds.KEY_EXTRA_SPLIT_BOUNDS; +import static java.util.stream.Collectors.toList; + import android.app.WindowConfiguration; import android.content.Context; import android.graphics.Rect; @@ -175,7 +177,7 @@ public class RemoteTargetGluer { mSplitBounds.rightBottomTaskId); List overlayTargets = Arrays.stream(targets.apps).filter( target -> target.windowConfiguration.getWindowingMode() - != WindowConfiguration.WINDOWING_MODE_MULTI_WINDOW).toList(); + != WindowConfiguration.WINDOWING_MODE_MULTI_WINDOW).collect(toList()); // remoteTargetHandle[0] denotes topLeft task, so we pass in the bottomRight to exclude, // vice versa @@ -223,7 +225,7 @@ public class RemoteTargetGluer { for (int i = 0; i < mRemoteTargetHandles.length; i++) { RemoteAnimationTarget primaryTaskTarget = targets.apps[i]; List excludeTargets = Arrays.stream(targets.apps) - .filter(target -> target.taskId != primaryTaskTarget.taskId).toList(); + .filter(target -> target.taskId != primaryTaskTarget.taskId).collect(toList()); mRemoteTargetHandles[i].mTransformParams.setTargetSet( createRemoteAnimationTargetsForTarget(targets, excludeTargets)); mRemoteTargetHandles[i].mTaskViewSimulator.setPreview(primaryTaskTarget, null); diff --git a/quickstep/src/com/android/quickstep/util/AppPairsController.java b/quickstep/src/com/android/quickstep/util/AppPairsController.java index 6f9cbfd74a..e878210164 100644 --- a/quickstep/src/com/android/quickstep/util/AppPairsController.java +++ b/quickstep/src/com/android/quickstep/util/AppPairsController.java @@ -33,6 +33,8 @@ import static com.android.wm.shell.common.split.SplitScreenConstants.SPLIT_POSIT import static com.android.wm.shell.common.split.SplitScreenConstants.SPLIT_POSITION_TOP_OR_LEFT; import static com.android.wm.shell.common.split.SplitScreenConstants.isPersistentSnapPosition; +import static java.util.stream.Collectors.toList; + import android.content.Context; import android.content.Intent; import android.content.pm.LauncherApps; @@ -336,7 +338,7 @@ public class AppPairsController { List itemInfos) { TaskbarActivityContext context = (TaskbarActivityContext) launchingIconView.getContext(); List componentKeys = - itemInfos.stream().map(ItemInfo::getComponentKey).toList(); + itemInfos.stream().map(ItemInfo::getComponentKey).collect(toList()); // Use TopTaskTracker to find the currently running app (or apps) TopTaskTracker topTaskTracker = getTopTaskTracker(); @@ -362,7 +364,7 @@ public class AppPairsController { } else { return INVALID_TASK_ID; } - }).toList(); + }).collect(toList()); if (lastActiveTasksOfAppPair.contains(runningTaskId1) && lastActiveTasksOfAppPair.contains(runningTaskId2)) { diff --git a/src/com/android/launcher3/celllayout/ReorderAlgorithm.java b/src/com/android/launcher3/celllayout/ReorderAlgorithm.java index 7a9afee0b4..2b592475f6 100644 --- a/src/com/android/launcher3/celllayout/ReorderAlgorithm.java +++ b/src/com/android/launcher3/celllayout/ReorderAlgorithm.java @@ -150,18 +150,11 @@ public class ReorderAlgorithm { ).thenComparing( view -> ((CellLayoutLayoutParams) ((View) view).getLayoutParams()).getCellY() ); - List views = new ArrayList<>(); - if (Utilities.ATLEAST_U) { - views = solution.map.keySet().stream().sorted(comparator).toList(); - } else { - List keys = new ArrayList<>(solution.map.keySet()); - for (Object key : keys) { - if (key instanceof View) { - views.add((View) key); - } - } - views.sort(comparator); - } + List views = solution.map.keySet().stream() + .filter(View.class::isInstance) + .map(View.class::cast) + .collect(Collectors.toList()); + views.sort(comparator); for (View child : views) { if (child == ignoreView) continue; CellAndSpan c = solution.map.get(child); diff --git a/src/com/android/launcher3/icons/ShortcutCachingLogic.java b/src/com/android/launcher3/icons/ShortcutCachingLogic.java index 09e9858813..1b8ddaf0a7 100644 --- a/src/com/android/launcher3/icons/ShortcutCachingLogic.java +++ b/src/com/android/launcher3/icons/ShortcutCachingLogic.java @@ -104,12 +104,10 @@ public class ShortcutCachingLogic implements CachingLogic { * Launcher specific checks */ public static Drawable getIcon(Context context, ShortcutInfo shortcutInfo, int density) { - if (!WIDGETS_ENABLED) { - return null; - } try { - return context.getSystemService(LauncherApps.class) + Drawable icon = context.getSystemService(LauncherApps.class) .getShortcutIconDrawable(shortcutInfo, density); + return CustomAdaptiveIconDrawable.wrap(icon); } catch (SecurityException | IllegalStateException | NullPointerException e) { Log.e(TAG, "Failed to get shortcut icon", e); return null; diff --git a/src/com/android/launcher3/model/BaseLauncherBinder.java b/src/com/android/launcher3/model/BaseLauncherBinder.java index 55dd121589..6a691723f8 100644 --- a/src/com/android/launcher3/model/BaseLauncherBinder.java +++ b/src/com/android/launcher3/model/BaseLauncherBinder.java @@ -417,15 +417,8 @@ public class BaseLauncherBinder { ModelWriter writer = mApp.getModel() .getWriter(false /* verifyChanges */, CellPosMapper.DEFAULT, null); - List> bindItems = null; - if (Utilities.ATLEAST_U) { - bindItems = items.stream().map(i -> - Pair.create(i, inflater.inflateItem(i, writer, null))).toList(); - } else { - bindItems = items.stream().map(i -> + List> finalBindItems = items.stream().map(i -> Pair.create(i, inflater.inflateItem(i, writer, null))).collect(Collectors.toList()); - } - List> finalBindItems = bindItems; executeCallbacksTask(c -> c.bindInflatedItems(finalBindItems), executor); } diff --git a/src/com/android/launcher3/model/ModelTaskController.kt b/src/com/android/launcher3/model/ModelTaskController.kt index b3648df55f..7693217676 100644 --- a/src/com/android/launcher3/model/ModelTaskController.kt +++ b/src/com/android/launcher3/model/ModelTaskController.kt @@ -19,7 +19,6 @@ package com.android.launcher3.model import com.android.launcher3.LauncherAppState import com.android.launcher3.LauncherModel import com.android.launcher3.LauncherModel.CallbackTask -import com.android.launcher3.Utilities import com.android.launcher3.celllayout.CellPosMapper import com.android.launcher3.model.BgDataModel.FixedContainerItems import com.android.launcher3.model.data.ItemInfo @@ -54,12 +53,7 @@ class ModelTaskController( fun bindUpdatedWorkspaceItems(allUpdates: List) { // Bind workspace items - val workspaceUpdates: MutableList - if (Utilities.ATLEAST_U) { - workspaceUpdates = allUpdates.stream().filter { info -> info.id != ItemInfo.NO_ID }.toList() - } else { - workspaceUpdates = allUpdates.stream().filter { info -> info.id != ItemInfo.NO_ID }.collect(Collectors.toList()) - } + val workspaceUpdates: MutableList = allUpdates.stream().filter { info -> info.id != ItemInfo.NO_ID }.collect(Collectors.toList()) if (workspaceUpdates.isNotEmpty()) { scheduleCallbackTask { it.bindWorkspaceItemsChanged(workspaceUpdates) } } diff --git a/src/com/android/launcher3/model/WidgetsModel.java b/src/com/android/launcher3/model/WidgetsModel.java index 6c8747dace..34fdc1c17c 100644 --- a/src/com/android/launcher3/model/WidgetsModel.java +++ b/src/com/android/launcher3/model/WidgetsModel.java @@ -94,12 +94,7 @@ public class WidgetsModel { Stream widgetItems = entry.getValue() .stream() .filter(widgetItemFilter); - List widgetItemsList; - if (Utilities.ATLEAST_U) { - widgetItemsList = widgetItems.toList(); - } else { - widgetItemsList = widgetItems.collect(toList()); - }; + List widgetItemsList = widgetItems.collect(toList()); if (!widgetItemsList.isEmpty()) { String sectionName = (pkgItem.title == null) ? "" : indexer.computeSectionName(pkgItem.title); diff --git a/src/com/android/launcher3/provider/RestoreDbTask.java b/src/com/android/launcher3/provider/RestoreDbTask.java index 47ce39e409..b093fe7372 100644 --- a/src/com/android/launcher3/provider/RestoreDbTask.java +++ b/src/com/android/launcher3/provider/RestoreDbTask.java @@ -31,6 +31,8 @@ import static com.android.launcher3.LauncherSettings.Favorites.ITEM_TYPE_APPWIDG import static com.android.launcher3.provider.LauncherDbUtils.dropTable; import static com.android.launcher3.widget.LauncherWidgetHolder.APPWIDGET_HOST_ID; +import static java.util.stream.Collectors.toList; + import android.app.backup.BackupManager; import android.appwidget.AppWidgetHost; import android.appwidget.AppWidgetManager; @@ -178,7 +180,7 @@ public class RestoreDbTask { // phone return LauncherFiles.GRID_DB_FILES.stream() .filter(dbName -> new File(dbName).exists()) - .toList(); + .collect(toList()); } /** diff --git a/src/com/android/launcher3/widget/picker/WidgetRecommendationsView.java b/src/com/android/launcher3/widget/picker/WidgetRecommendationsView.java index 9260af9b22..5e19d24e93 100644 --- a/src/com/android/launcher3/widget/picker/WidgetRecommendationsView.java +++ b/src/com/android/launcher3/widget/picker/WidgetRecommendationsView.java @@ -18,6 +18,8 @@ package com.android.launcher3.widget.picker; import static com.android.launcher3.widget.util.WidgetsTableUtils.groupWidgetItemsUsingRowPxWithoutReordering; +import static java.util.stream.Collectors.toList; + import android.content.ComponentName; import android.content.Context; import android.os.Bundle; @@ -318,7 +320,7 @@ public final class WidgetRecommendationsView extends PagedView mDisplayedWidgets.contains(w.componentName)).toList(); + w -> mDisplayedWidgets.contains(w.componentName)).collect(toList()); } Context context = getContext(); LayoutInflater inflater = LayoutInflater.from(context); diff --git a/src/com/android/launcher3/widget/picker/WidgetsRecommendationTableLayout.java b/src/com/android/launcher3/widget/picker/WidgetsRecommendationTableLayout.java index 47a98990bc..0cbad82178 100644 --- a/src/com/android/launcher3/widget/picker/WidgetsRecommendationTableLayout.java +++ b/src/com/android/launcher3/widget/picker/WidgetsRecommendationTableLayout.java @@ -21,6 +21,7 @@ import static com.android.launcher3.widget.util.WidgetSizes.getWidgetSizePx; import static com.android.launcher3.widget.util.WidgetsTableUtils.WIDGETS_TABLE_ROW_SIZE_COMPARATOR; import static java.lang.Math.max; +import static java.util.stream.Collectors.toList; import android.content.Context; import android.util.AttributeSet; @@ -186,6 +187,6 @@ public final class WidgetsRecommendationTableLayout extends TableLayout { } // Perform re-ordering once we have filtered out recommendations that fit. - return filteredRows.stream().sorted(WIDGETS_TABLE_ROW_SIZE_COMPARATOR).toList(); + return filteredRows.stream().sorted(WIDGETS_TABLE_ROW_SIZE_COMPARATOR).collect(toList()); } } diff --git a/src/com/android/launcher3/widget/util/WidgetsTableUtils.java b/src/com/android/launcher3/widget/util/WidgetsTableUtils.java index 81ea0190bf..0e007a0edc 100644 --- a/src/com/android/launcher3/widget/util/WidgetsTableUtils.java +++ b/src/com/android/launcher3/widget/util/WidgetsTableUtils.java @@ -83,11 +83,7 @@ public final class WidgetsTableUtils { sortedWidgetItems, context, dp, rowPx, cellPadding); Stream> sortedRows = rows.stream().sorted(WIDGETS_TABLE_ROW_SIZE_COMPARATOR); - if (Utilities.ATLEAST_U) { - return sortedRows.toList(); - } else { - return sortedRows.collect(Collectors.toList()); - } + return sortedRows.collect(Collectors.toList()); } /** diff --git a/systemUI/viewcapture/src/com/android/app/viewcapture/ViewCapture.java b/systemUI/viewcapture/src/com/android/app/viewcapture/ViewCapture.java index d74d042029..85df9a9e36 100644 --- a/systemUI/viewcapture/src/com/android/app/viewcapture/ViewCapture.java +++ b/systemUI/viewcapture/src/com/android/app/viewcapture/ViewCapture.java @@ -19,6 +19,8 @@ package com.android.app.viewcapture; import static com.android.app.viewcapture.data.ExportedData.MagicNumber.MAGIC_NUMBER_H; import static com.android.app.viewcapture.data.ExportedData.MagicNumber.MAGIC_NUMBER_L; +import static java.util.stream.Collectors.toList; + import android.content.ComponentCallbacks2; import android.content.Context; import android.content.res.Configuration; @@ -206,7 +208,7 @@ public abstract class ViewCapture { } private static List toStringList(List classList) { - return classList.stream().map(Class::getName).toList(); + return classList.stream().map(Class::getName).collect(toList()); } public CompletableFuture> getDumpTask(View view) { @@ -224,8 +226,8 @@ public abstract class ViewCapture { ArrayList outClassList, Predicate filter) { ViewIdProvider idProvider = new ViewIdProvider(context.getResources()); return CompletableFuture.supplyAsync(() -> - mListeners.stream().filter(filter).toList(), MAIN_EXECUTOR).thenApplyAsync(it -> - it.stream().map(l -> l.dumpToProto(idProvider, outClassList)).toList(), + mListeners.stream().filter(filter).collect(toList()), MAIN_EXECUTOR).thenApplyAsync(it -> + it.stream().map(l -> l.dumpToProto(idProvider, outClassList)).collect(toList()), mBgExecutor); } diff --git a/wmshell/src/com/android/wm/shell/bubbles/BubbleController.java b/wmshell/src/com/android/wm/shell/bubbles/BubbleController.java index d2c36e6b63..33474091dd 100644 --- a/wmshell/src/com/android/wm/shell/bubbles/BubbleController.java +++ b/wmshell/src/com/android/wm/shell/bubbles/BubbleController.java @@ -1516,7 +1516,7 @@ public class BubbleController implements ConfigurationChangeListener, } mOverflowDataLoadNeeded = false; List users = mUserManager.getAliveUsers(); - List userIds = users.stream().map(userInfo -> userInfo.id).toList(); + List userIds = users.stream().map(userInfo -> userInfo.id).collect(Collectors.toList()); mDataRepository.loadBubbles(mCurrentUserId, userIds, (bubbles) -> { bubbles.forEach(bubble -> { if (mBubbleData.hasAnyBubbleWithKey(bubble.getKey())) {