diff options
| author | Steve Howard <showard@google.com> | 2010-09-30 16:22:58 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-09-30 16:22:58 -0700 |
| commit | 4ba2817c869d4ec6b518a57ea32cc3765b18b0db (patch) | |
| tree | 169f1a63cdd87e4cc160d17288c7952ff372e554 /core | |
| parent | 0a972acf85ce0cf7bba5a77628e9cf59a0946bd0 (diff) | |
| parent | 99047d7b6519f0a29b88a5f347a0e4179012f9d2 (diff) | |
| download | frameworks_base-4ba2817c869d4ec6b518a57ea32cc3765b18b0db.zip frameworks_base-4ba2817c869d4ec6b518a57ea32cc3765b18b0db.tar.gz frameworks_base-4ba2817c869d4ec6b518a57ea32cc3765b18b0db.tar.bz2 | |
Merge "Avoid NPE when viewing failed legacy download with no local path" into gingerbread
Diffstat (limited to 'core')
| -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 |