summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSudheer Shanka <sudheersai@google.com>2019-05-07 11:02:42 -0700
committerandroid-build-merger <android-build-merger@google.com>2019-05-07 11:02:42 -0700
commit753d624fe6d60350bd559712df479c4a4ca8b9b6 (patch)
tree77ef743aeb1c50466d02a28d74f35aa29f55e0b7
parent67c236402ddca80669857e7e290c7fa4163ee0e3 (diff)
parentfd26f316f00d889c7b4b4ab077b0f00a1e1f29a7 (diff)
downloadandroid_packages_providers_DownloadProvider-753d624fe6d60350bd559712df479c4a4ca8b9b6.tar.gz
android_packages_providers_DownloadProvider-753d624fe6d60350bd559712df479c4a4ca8b9b6.tar.bz2
android_packages_providers_DownloadProvider-753d624fe6d60350bd559712df479c4a4ca8b9b6.zip
Merge "Don't log when checking if a filepath belongs to certain dirs." into qt-dev
am: fd26f316f0 Change-Id: I3a23566d35d63b7227c02c82b64f4fc508670a89
-rw-r--r--src/com/android/providers/downloads/DownloadProvider.java7
-rw-r--r--src/com/android/providers/downloads/Helpers.java3
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;
}