diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2019-05-30 03:01:16 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2019-05-30 03:01:16 +0000 |
| commit | 5b237b43e9b584e6d2ae01f786b6de2d10eee63c (patch) | |
| tree | ac18543afa77ab580da0644ae759e23d48c11dfe | |
| parent | 27029a5c6a2d5f601f40401f7db83f2c0ca3f290 (diff) | |
| parent | 24928d930e70185179e5c6ae078b00608fbd9ba4 (diff) | |
| download | android_packages_providers_DownloadProvider-5b237b43e9b584e6d2ae01f786b6de2d10eee63c.tar.gz android_packages_providers_DownloadProvider-5b237b43e9b584e6d2ae01f786b6de2d10eee63c.tar.bz2 android_packages_providers_DownloadProvider-5b237b43e9b584e6d2ae01f786b6de2d10eee63c.zip | |
Snap for 5616725 from 24928d930e70185179e5c6ae078b00608fbd9ba4 to qt-qpr1-release
Change-Id: I60cd0d07f641a4ce5055961dd8685b35f292855a
| -rw-r--r-- | src/com/android/providers/downloads/Helpers.java | 5 |
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); |