Skip to content

Commit 6f12acd

Browse files
committed
Fix Stream toList crash
Signed-off-by: saulhdev <saul_henriquez@hotmail.com>
1 parent cf7df34 commit 6f12acd

File tree

4 files changed

+10
-9
lines changed

4 files changed

+10
-9
lines changed

.github/workflows/android.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
name: Neo Launcher CI
22
on:
33
push:
4-
branches: [ A-13 ]
4+
branches: [ A-15 ]
55
pull_request:
6-
branches: [ A-13 ]
6+
branches: [ A-15 ]
77

88
jobs:
99
build:
1010
runs-on: ubuntu-latest
1111
steps:
1212
- uses: actions/checkout@v3
13-
- name: set up JDK 17
13+
- name: set up JDK 21
1414
uses: actions/setup-java@v3
1515
with:
16-
java-version: 17
16+
java-version: 21
1717
distribution: 'temurin'
1818
cache: gradle
1919
- uses: actions/cache@v3

gradle/libs.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[versions]
22
activity = "1.10.0"
3-
agp = "8.10.0-alpha05"
3+
agp = "8.10.0-alpha08"
44
alwan = "1.0.1"
55
androidx-animation = "1.0.0"
66
androidx-annotation = "1.7.1"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -413,7 +413,7 @@ private void inflateAsyncAndBind(
413413
ModelWriter writer = mApp.getModel()
414414
.getWriter(false /* verifyChanges */, CellPosMapper.DEFAULT, null);
415415
List<Pair<ItemInfo, View>> bindItems = items.stream().map(i ->
416-
Pair.create(i, inflater.inflateItem(i, writer, null))).toList();
416+
Pair.create(i, inflater.inflateItem(i, writer, null))).collect(Collectors.toList());
417417
executeCallbacksTask(c -> c.bindInflatedItems(bindItems), executor);
418418
}
419419

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,7 @@
109109
import java.util.Objects;
110110
import java.util.Set;
111111
import java.util.concurrent.CancellationException;
112+
import java.util.stream.Collectors;
112113

113114
/**
114115
* Runnable for the thread that loads the contents of the launcher:
@@ -446,8 +447,8 @@ private void loadWorkspaceImpl(
446447
mInstallingPkgsCached = installingPkgs;
447448
}
448449
installingPkgs.forEach(mApp.getIconCache()::updateSessionCache);
449-
FileLog.d(TAG, "loadWorkspace: Packages with active install sessions: ");
450-
//+ installingPkgs.keySet().stream().map(info -> info.mPackageName).toList());
450+
FileLog.d(TAG, "loadWorkspace: Packages with active install sessions: "
451+
+ installingPkgs.keySet().stream().map(info -> info.mPackageName).collect(Collectors.toList()));
451452

452453
mFirstScreenBroadcast = new FirstScreenBroadcast(installingPkgs);
453454

@@ -571,7 +572,7 @@ private void queryPinnedShortcutsForUnlockedUsers(Context context,
571572
private void processFolderItems() {
572573
// Sort the folder items, update ranks, and make sure all preview items are high res.
573574
List<FolderGridOrganizer> verifiers = mApp.getInvariantDeviceProfile().supportedProfiles
574-
.stream().map(FolderGridOrganizer::createFolderGridOrganizer).toList();
575+
.stream().map(FolderGridOrganizer::createFolderGridOrganizer).collect(Collectors.toList());
575576
for (CollectionInfo collection : mBgDataModel.collections) {
576577
if (!(collection instanceof FolderInfo folder)) {
577578
continue;

0 commit comments

Comments
 (0)