summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSudheer Shanka <sudheersai@google.com>2019-05-29 10:52:36 -0700
committerSudheer Shanka <sudheersai@google.com>2019-05-29 10:52:36 -0700
commit83652c8e03abb7e5ffcba37bd2e3003f5f6477ef (patch)
treeac18543afa77ab580da0644ae759e23d48c11dfe
parent7221fab459901f4414a2297f9deed3807a98f698 (diff)
downloadandroid_packages_providers_DownloadProvider-83652c8e03abb7e5ffcba37bd2e3003f5f6477ef.tar.gz
android_packages_providers_DownloadProvider-83652c8e03abb7e5ffcba37bd2e3003f5f6477ef.tar.bz2
android_packages_providers_DownloadProvider-83652c8e03abb7e5ffcba37bd2e3003f5f6477ef.zip
Delete entries of uninstalled pkgs which haven't started downloading.
Fixes: 133741222 Test: manual Test: atest DownloadProviderTests Test: atest cts/tests/app/src/android/app/cts/DownloadManagerTest.java Test: atest cts/tests/app/DownloadManagerLegacyTest/src/android/app/cts/DownloadManagerLegacyTest.java Test: atest cts/tests/app/DownloadManagerApi28Test/src/android/app/cts/DownloadManagerApi28Test.java Change-Id: I00796e5ff8e9b30d153490f997fb7c776b600e57
-rw-r--r--src/com/android/providers/downloads/Helpers.java5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/com/android/providers/downloads/Helpers.java b/src/com/android/providers/downloads/Helpers.java
index 408754a0..7b4cb4e9 100644
--- a/src/com/android/providers/downloads/Helpers.java
+++ b/src/com/android/providers/downloads/Helpers.java
@@ -537,7 +537,10 @@ public class Helpers {
}
@com.android.internal.annotations.VisibleForTesting
- public static boolean isFilenameValidInKnownPublicDir(String filePath) {
+ public static boolean isFilenameValidInKnownPublicDir(@Nullable String filePath) {
+ if (filePath == null) {
+ return false;
+ }
final Matcher matcher = PATTERN_PUBLIC_DIRS.matcher(filePath);
if (matcher.matches()) {
final String publicDir = matcher.group(1);