summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2019-05-29 20:18:08 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2019-05-29 20:18:08 +0000
commit1ab3616ee298e132ca52d6198980ae27d294f055 (patch)
tree23a7daa42f310f6b8dbdb74d6baf087187d95d76
parent36432867c1086be3384a07f84e834a0547b6341a (diff)
parent83652c8e03abb7e5ffcba37bd2e3003f5f6477ef (diff)
downloadandroid_packages_providers_DownloadProvider-1ab3616ee298e132ca52d6198980ae27d294f055.tar.gz
android_packages_providers_DownloadProvider-1ab3616ee298e132ca52d6198980ae27d294f055.tar.bz2
android_packages_providers_DownloadProvider-1ab3616ee298e132ca52d6198980ae27d294f055.zip
Merge "Delete entries of uninstalled pkgs which haven't started downloading." into qt-dev
-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);