diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2019-05-08 03:14:19 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2019-05-08 03:14:19 +0000 |
| commit | afd562e193d867dab9eb4702c33b22f2e39e4b80 (patch) | |
| tree | 115dfb2f4e87ab00943019bb2a526871964ea449 | |
| parent | fdebf40dbadb019fe6eec9b7f24c13d37b6a6e68 (diff) | |
| parent | fd26f316f00d889c7b4b4ab077b0f00a1e1f29a7 (diff) | |
| download | android_packages_providers_DownloadProvider-afd562e193d867dab9eb4702c33b22f2e39e4b80.tar.gz android_packages_providers_DownloadProvider-afd562e193d867dab9eb4702c33b22f2e39e4b80.tar.bz2 android_packages_providers_DownloadProvider-afd562e193d867dab9eb4702c33b22f2e39e4b80.zip | |
Snap for 5540187 from fd26f316f00d889c7b4b4ab077b0f00a1e1f29a7 to qt-release
Change-Id: Iab75f92d5e45c38ecf4ed09cf93d02616de2096c
| -rw-r--r-- | src/com/android/providers/downloads/DownloadProvider.java | 7 | ||||
| -rw-r--r-- | src/com/android/providers/downloads/Helpers.java | 3 |
2 files changed, 6 insertions, 4 deletions
diff --git a/src/com/android/providers/downloads/DownloadProvider.java b/src/com/android/providers/downloads/DownloadProvider.java index b9b249ab..f393333b 100644 --- a/src/com/android/providers/downloads/DownloadProvider.java +++ b/src/com/android/providers/downloads/DownloadProvider.java @@ -1831,14 +1831,19 @@ public final class DownloadProvider extends ContentProvider { final String path = info.mFileName; if (!TextUtils.isEmpty(path)) { + boolean fileDeleted = false; try { final File file = new File(path).getCanonicalFile(); if (Helpers.isFilenameValid(getContext(), file)) { Log.v(Constants.TAG, "Deleting " + file + " via provider delete"); file.delete(); + fileDeleted = true; } - } catch (IOException ignored) { + } catch (IOException ignore) { + } + if (!fileDeleted) { + Log.d(Constants.TAG, "Ignoring invalid path: " + path); } } diff --git a/src/com/android/providers/downloads/Helpers.java b/src/com/android/providers/downloads/Helpers.java index 99ced675..a3832872 100644 --- a/src/com/android/providers/downloads/Helpers.java +++ b/src/com/android/providers/downloads/Helpers.java @@ -507,7 +507,6 @@ public class Helpers { return false; } - Log.w(TAG, "Path appears to be invalid: " + file); return false; } @@ -522,7 +521,6 @@ public class Helpers { return false; } - Log.w(TAG, "Path appears to be invalid: " + file); return false; } @@ -552,7 +550,6 @@ public class Helpers { return false; } - Log.w(TAG, "Path appears to be invalid: " + file); return false; } |