diff options
| author | Steve Howard <showard@google.com> | 2010-10-01 13:14:27 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-01 13:14:27 -0700 |
| commit | 42469fa405c7aa891e7c431cd65edd424803979c (patch) | |
| tree | edd91dcc1ac417dd0cf91df999e76ca2d532f6cc /src | |
| parent | f28405c10d132a2eeaff5140d8a83a72d9fa530b (diff) | |
| parent | 5d81e2447ed77860afecd71583e137178c2c6807 (diff) | |
| download | android_packages_providers_DownloadProvider-42469fa405c7aa891e7c431cd65edd424803979c.tar.gz android_packages_providers_DownloadProvider-42469fa405c7aa891e7c431cd65edd424803979c.tar.bz2 android_packages_providers_DownloadProvider-42469fa405c7aa891e7c431cd65edd424803979c.zip | |
am 5d81e244: Avoid NPE when checking file URI in DownloadProvider
Merge commit '5d81e2447ed77860afecd71583e137178c2c6807' into gingerbread-plus-aosp
* commit '5d81e2447ed77860afecd71583e137178c2c6807':
Avoid NPE when checking file URI in DownloadProvider
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/providers/downloads/DownloadProvider.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/com/android/providers/downloads/DownloadProvider.java b/src/com/android/providers/downloads/DownloadProvider.java index 2cbf7fbb..9b86adff 100644 --- a/src/com/android/providers/downloads/DownloadProvider.java +++ b/src/com/android/providers/downloads/DownloadProvider.java @@ -538,7 +538,8 @@ public final class DownloadProvider extends ContentProvider { "DESTINATION_FILE_URI must include a file URI under COLUMN_FILE_NAME_HINT"); } Uri uri = Uri.parse(fileUri); - if (!uri.getScheme().equals("file")) { + String scheme = uri.getScheme(); + if (scheme == null || !scheme.equals("file")) { throw new IllegalArgumentException("Not a file URI: " + uri); } String path = uri.getPath(); |