diff options
| author | Steve Howard <showard@google.com> | 2010-09-29 17:41:37 -0700 |
|---|---|---|
| committer | Steve Howard <showard@google.com> | 2010-09-30 11:14:09 -0700 |
| commit | 99047d7b6519f0a29b88a5f347a0e4179012f9d2 (patch) | |
| tree | 2580fe4bf434d8077b148d2d32e634deb8179a59 /core/java | |
| parent | cdcc0a65fae7e649f0f07e396dbe0dd59ceffada (diff) | |
| download | frameworks_base-99047d7b6519f0a29b88a5f347a0e4179012f9d2.zip frameworks_base-99047d7b6519f0a29b88a5f347a0e4179012f9d2.tar.gz frameworks_base-99047d7b6519f0a29b88a5f347a0e4179012f9d2.tar.bz2 | |
Avoid NPE when viewing failed legacy download with no local path
Change-Id: I3e9d349959543f42afed67de9f6d299c268ab7ac
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/app/DownloadManager.java | 6 |
1 files changed, 5 insertions, 1 deletions
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 @@ 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 |