From 99047d7b6519f0a29b88a5f347a0e4179012f9d2 Mon Sep 17 00:00:00 2001
From: Steve Howard <showard@google.com>
Date: Wed, 29 Sep 2010 17:41:37 -0700
Subject: Avoid NPE when viewing failed legacy download with no local path

Change-Id: I3e9d349959543f42afed67de9f6d299c268ab7ac
---
 core/java/android/app/DownloadManager.java | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'core/java/android/app/DownloadManager.java')

diff --git a/core/java/android/app/DownloadManager.java b/core/java/android/app/DownloadManager.java
index 3ec21ff90900..9d559d4664a3 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
-- 
cgit v1.2.3