diff options
| author | Sudheer Shanka <sudheersai@google.com> | 2019-05-06 18:24:31 -0700 |
|---|---|---|
| committer | Sudheer Shanka <sudheersai@google.com> | 2019-05-06 18:27:39 -0700 |
| commit | d10e7951f112bfe55430041e6867450dcf18c89a (patch) | |
| tree | b0bcf6a736e2fcdb03c4f86262aa5b0eec1e597c | |
| parent | e6b506950f7fbfa12a2063fc0b732362a559da13 (diff) | |
| download | android_packages_providers_DownloadProvider-d10e7951f112bfe55430041e6867450dcf18c89a.tar.gz android_packages_providers_DownloadProvider-d10e7951f112bfe55430041e6867450dcf18c89a.tar.bz2 android_packages_providers_DownloadProvider-d10e7951f112bfe55430041e6867450dcf18c89a.zip | |
Don't log when checking if a filepath belongs to certain dirs.
Bug: 131693243
Test: n/a
Change-Id: Iae700a00f1bca78f823a3f8b732d86d380942828
| -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; } |