From fc2c3ee1155b14dde126a3ceebb3a78b3620f971 Mon Sep 17 00:00:00 2001 From: TranceLove Date: Fri, 4 Dec 2020 08:14:16 +0800 Subject: [PATCH] Null check of ApplicationInfo.sourceDir Fixes #1604. Also changed back test forkEvery settings to last known working value. Slower, but works. --- .../filemanager/asynchronous/loaders/AppListLoader.java | 3 +++ build.gradle | 5 ++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/amaze/filemanager/asynchronous/loaders/AppListLoader.java b/app/src/main/java/com/amaze/filemanager/asynchronous/loaders/AppListLoader.java index 53338e010..6e9db0cbb 100644 --- a/app/src/main/java/com/amaze/filemanager/asynchronous/loaders/AppListLoader.java +++ b/app/src/main/java/com/amaze/filemanager/asynchronous/loaders/AppListLoader.java @@ -75,6 +75,9 @@ public class AppListLoader extends AsyncTaskLoader { mApps = new AppsDataPair(new ArrayList<>(apps.size()), new ArrayList<>(apps.size())); for (ApplicationInfo object : apps) { + if (object.sourceDir == null) { + continue; + } File sourceDir = new File(object.sourceDir); String label = object.loadLabel(packageManager).toString(); diff --git a/build.gradle b/build.gradle index b4122812a..b6866a6c9 100644 --- a/build.gradle +++ b/build.gradle @@ -32,10 +32,9 @@ allprojects { mavenCentral() } tasks.withType(Test) { - maxParallelForks = 4 + maxParallelForks = 2 maxHeapSize = "4g" - forkEvery = 4 - } + forkEvery = 2 } } spotless {