am efb8b427: am 4ba2817c: Merge "Avoid NPE when viewing failed legacy download with no local path" into gingerbread

Merge commit 'efb8b42789a291e38a7e837f64d18bcb511f65f9'

* commit 'efb8b42789a291e38a7e837f64d18bcb511f65f9':
  Avoid NPE when viewing failed legacy download with no local path

1 files changed, 5 insertions, 1 deletions

diff --git a/core/java/android/app/DownloadManager.java b/core/java/android/app/DownloadManager.java
index 0398b36c9e89..1ebece4bdf0d 100644
--- 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