From 5d81e2447ed77860afecd71583e137178c2c6807 Mon Sep 17 00:00:00 2001 From: Steve Howard Date: Thu, 30 Sep 2010 19:45:56 -0700 Subject: Avoid NPE when checking file URI in DownloadProvider Change-Id: Ic937b05308cecce244725e25767a3a1310a8463d --- src/com/android/providers/downloads/DownloadProvider.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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(); -- cgit v1.2.3