diff options
author | Steve Howard <showard@google.com> | 2010-09-20 15:43:49 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-20 15:43:49 -0700 |
commit | 2031fa7bad5ef3e31cf0ea73d0b9bf4670842cf0 (patch) | |
tree | 89cfcc04ba69c0623cd4fcfcd39c0fec2c3e92fb /src/com/android/providers/downloads/DownloadProvider.java | |
parent | b8cadd87bfc628090c36f74979c7691bb1219ea1 (diff) | |
parent | dc738781156d0f5ac1db62838d42c876d740810d (diff) | |
download | android_packages_providers_DownloadProvider-2031fa7bad5ef3e31cf0ea73d0b9bf4670842cf0.tar.gz android_packages_providers_DownloadProvider-2031fa7bad5ef3e31cf0ea73d0b9bf4670842cf0.tar.bz2 android_packages_providers_DownloadProvider-2031fa7bad5ef3e31cf0ea73d0b9bf4670842cf0.zip |
am dc738781: Merge "Improve file error reporting + new detailed error messages in UI" into gingerbread
Merge commit 'dc738781156d0f5ac1db62838d42c876d740810d' into gingerbread-plus-aosp
* commit 'dc738781156d0f5ac1db62838d42c876d740810d':
Improve file error reporting + new detailed error messages in UI
Diffstat (limited to 'src/com/android/providers/downloads/DownloadProvider.java')
-rw-r--r-- | src/com/android/providers/downloads/DownloadProvider.java | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/com/android/providers/downloads/DownloadProvider.java b/src/com/android/providers/downloads/DownloadProvider.java index df7ca71d..102c611d 100644 --- a/src/com/android/providers/downloads/DownloadProvider.java +++ b/src/com/android/providers/downloads/DownloadProvider.java @@ -121,6 +121,7 @@ public final class DownloadProvider extends ContentProvider { Downloads.Impl.COLUMN_DESCRIPTION, Downloads.Impl.COLUMN_URI, Downloads.Impl.COLUMN_IS_VISIBLE_IN_DOWNLOADS_UI, + Downloads.Impl.COLUMN_FILE_NAME_HINT, }; private static HashSet<String> sAppReadableColumnsSet; @@ -508,9 +509,12 @@ public final class DownloadProvider extends ContentProvider { if (!uri.getScheme().equals("file")) { throw new IllegalArgumentException("Not a file URI: " + uri); } - File path = new File(uri.getSchemeSpecificPart()); + String path = uri.getPath(); + if (path == null) { + throw new IllegalArgumentException("Invalid file URI: " + uri); + } String externalPath = Environment.getExternalStorageDirectory().getAbsolutePath(); - if (!path.getPath().startsWith(externalPath)) { + if (!path.startsWith(externalPath)) { throw new SecurityException("Destination must be on external storage: " + uri); } } |