diff options
| author | Steve Howard <showard@google.com> | 2010-10-01 14:18:58 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-01 14:18:58 -0700 |
| commit | b00b6560382d2b51ab2741f710738a281128dbea (patch) | |
| tree | b2f0ba0c6ab71220433f50540fb38112f7b65ca5 /src/com/android/providers/downloads/DownloadProvider.java | |
| parent | 546b6f4694a0da9d15256de304b9c49ad74b084a (diff) | |
| parent | 42469fa405c7aa891e7c431cd65edd424803979c (diff) | |
| download | android_packages_providers_DownloadProvider-b00b6560382d2b51ab2741f710738a281128dbea.tar.gz android_packages_providers_DownloadProvider-b00b6560382d2b51ab2741f710738a281128dbea.tar.bz2 android_packages_providers_DownloadProvider-b00b6560382d2b51ab2741f710738a281128dbea.zip | |
am 42469fa4: am 5d81e244: Avoid NPE when checking file URI in DownloadProvider
Merge commit '42469fa405c7aa891e7c431cd65edd424803979c'
* commit '42469fa405c7aa891e7c431cd65edd424803979c':
Avoid NPE when checking file URI in DownloadProvider
Diffstat (limited to 'src/com/android/providers/downloads/DownloadProvider.java')
| -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 44d755d3..a7779d8b 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(); |