Merge "Avoid NPE when viewing failed legacy download with no local path" into gingerbread

2010-09-30 16:22:58 -07:00
parent 0a972acf85 99047d7b65
commit 4ba2817c86
1 changed files with 5 additions and 1 deletions
--- a/core/java/android/app/DownloadManager.java
+++ b/core/java/android/app/DownloadManager.java
@@ -923,7 +923,11 @@ public class DownloadManager {

            if (destinationType == Downloads.Impl.DESTINATION_EXTERNAL) {
                // return stored destination for legacy external download
-                return Uri.fromFile(new File(getUnderlyingString(Downloads.Impl._DATA))).toString();
+                String localPath = getUnderlyingString(Downloads.Impl._DATA);
+                if (localPath == null) {
+                    return null;
+                }
+                return Uri.fromFile(new File(localPath)).toString();
            }

            // return content URI for cache download