From 83652c8e03abb7e5ffcba37bd2e3003f5f6477ef Mon Sep 17 00:00:00 2001 From: Sudheer Shanka Date: Wed, 29 May 2019 10:52:36 -0700 Subject: 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 --- src/com/android/providers/downloads/Helpers.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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); -- cgit v1.2.3