Revert "Use resolved path for both checking and opening."
Jeff Sharkey [Fri, 22 Jan 2016 22:22:25 +0000 (22:22 +0000)]
This reverts commit 366af2ee1f841615d44ab770b537112d769eed05.

Change-Id: Id1155425ebcae23be8ce3916f19dda82eee992c4

src/com/android/providers/downloads/DownloadProvider.java
src/com/android/providers/downloads/Helpers.java

index 620085f..94e5a99 100644 (file)
@@ -1260,15 +1260,9 @@ public final class DownloadProvider extends ContentProvider {
             throw new FileNotFoundException("No filename found.");
         }
 
-        final File file;
-        try {
-            file = new File(path).getCanonicalFile();
-        } catch (IOException e) {
-            throw new FileNotFoundException(e.getMessage());
-        }
-
+        final File file = new File(path);
         if (!Helpers.isFilenameValid(getContext(), file)) {
-            throw new FileNotFoundException("Invalid file path: " + file);
+            throw new FileNotFoundException("Invalid file: " + file);
         }
 
         final int pfdMode = ParcelFileDescriptor.parseMode(mode);
index d01cbff..d1cc545 100644 (file)
@@ -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)