diff options
| author | Jeff Sharkey <jsharkey@google.com> | 2016-01-22 22:22:25 +0000 |
|---|---|---|
| committer | Jeff Sharkey <jsharkey@google.com> | 2016-01-22 22:22:25 +0000 |
| commit | a4af46faac3ed68540d634e25f311cb7e071e6a5 (patch) | |
| tree | 32dc7bf958845e97f12edfa6cf6f32a665c43e58 /src/com/android/providers/downloads/Helpers.java | |
| parent | 366af2ee1f841615d44ab770b537112d769eed05 (diff) | |
| download | android_packages_providers_DownloadProvider-a4af46faac3ed68540d634e25f311cb7e071e6a5.tar.gz android_packages_providers_DownloadProvider-a4af46faac3ed68540d634e25f311cb7e071e6a5.tar.bz2 android_packages_providers_DownloadProvider-a4af46faac3ed68540d634e25f311cb7e071e6a5.zip | |
Revert "Use resolved path for both checking and opening."
This reverts commit 366af2ee1f841615d44ab770b537112d769eed05.
Change-Id: Id1155425ebcae23be8ce3916f19dda82eee992c4
Diffstat (limited to 'src/com/android/providers/downloads/Helpers.java')
| -rw-r--r-- | src/com/android/providers/downloads/Helpers.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/com/android/providers/downloads/Helpers.java b/src/com/android/providers/downloads/Helpers.java index d01cbff2..d1cc5450 100644 --- a/src/com/android/providers/downloads/Helpers.java +++ b/src/com/android/providers/downloads/Helpers.java @@ -357,6 +357,8 @@ public class Helpers { static boolean isFilenameValidInExternalPackage(Context context, File file, String packageName) { try { + file = file.getCanonicalFile(); + if (containsCanonical(buildExternalStorageAppFilesDirs(packageName), file) || containsCanonical(buildExternalStorageAppObbDirs(packageName), file) || containsCanonical(buildExternalStorageAppCacheDirs(packageName), file) || @@ -378,6 +380,8 @@ public class Helpers { */ static boolean isFilenameValid(Context context, File file, boolean allowInternal) { try { + file = file.getCanonicalFile(); + if (allowInternal) { if (containsCanonical(context.getFilesDir(), file) || containsCanonical(context.getCacheDir(), file) |