diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2019-05-30 03:17:19 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2019-05-30 03:17:19 +0000 |
| commit | bb5dad848dbd975c5a756ad79e254f25d6006cc2 (patch) | |
| tree | 23a7daa42f310f6b8dbdb74d6baf087187d95d76 | |
| parent | 1ae2d954d3c8a6c8b49d90566ce1a023127b61a3 (diff) | |
| parent | 1ab3616ee298e132ca52d6198980ae27d294f055 (diff) | |
| download | android_packages_providers_DownloadProvider-bb5dad848dbd975c5a756ad79e254f25d6006cc2.tar.gz android_packages_providers_DownloadProvider-bb5dad848dbd975c5a756ad79e254f25d6006cc2.tar.bz2 android_packages_providers_DownloadProvider-bb5dad848dbd975c5a756ad79e254f25d6006cc2.zip | |
Snap for 5616629 from 1ab3616ee298e132ca52d6198980ae27d294f055 to qt-release
Change-Id: I00740a164217c358f74e76f7e573112fe42946ac
| -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); |