commit 99047d7b6519f0a29b88a5f347a0e4179012f9d2
author Steve Howard <showard@google.com> Wed Sep 29 17:41:37 2010 -0700
committer Steve Howard <showard@google.com> Thu Sep 30 11:14:09 2010 -0700
tree 2580fe4bf434d8077b148d2d32e634deb8179a59
parent cdcc0a65fae7e649f0f07e396dbe0dd59ceffada

Avoid NPE when viewing failed legacy download with no local path

Change-Id: I3e9d349959543f42afed67de9f6d299c268ab7ac

core/java/android/app/DownloadManager.java

diff --git a/core/java/android/app/DownloadManager.java b/core/java/android/app/DownloadManager.java
index 3ec21ff..9d559d4 100644
--- a/core/java/android/app/DownloadManager.java
+++ b/core/java/android/app/DownloadManager.java
@@ -923,7 +923,11 @@
 
             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