Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Merge commit '4ba2817c869d4ec6b518a57ea32cc3765b18b0db' into gingerbread-plus-aosp

* commit '4ba2817c869d4ec6b518a57ea32cc3765b18b0db':
  Avoid NPE when viewing failed legacy download with no local path
This commit is contained in:
Steve Howard
2010-09-30 17:22:35 -07:00
committed by Android Git Automerger
parent 738aadd70f 4ba2817c86
commit efb8b42789
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/android/app/DownloadManager.java
View File

@@ -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