summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSudheer Shanka <sudheersai@google.com>2019-05-29 13:30:59 -0700
committerandroid-build-merger <android-build-merger@google.com>2019-05-29 13:30:59 -0700
commit24928d930e70185179e5c6ae078b00608fbd9ba4 (patch)
treeac18543afa77ab580da0644ae759e23d48c11dfe
parentc60322906062762b3ba87a7149d489f96b6d7bc2 (diff)
parent1ab3616ee298e132ca52d6198980ae27d294f055 (diff)
downloadandroid_packages_providers_DownloadProvider-24928d930e70185179e5c6ae078b00608fbd9ba4.tar.gz
android_packages_providers_DownloadProvider-24928d930e70185179e5c6ae078b00608fbd9ba4.tar.bz2
android_packages_providers_DownloadProvider-24928d930e70185179e5c6ae078b00608fbd9ba4.zip
Merge "Delete entries of uninstalled pkgs which haven't started downloading." into qt-dev
am: 1ab3616ee2 Change-Id: I285dde017e503bf2348256cde44e9eeb82f8d1be
-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);