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

am bb0d23b5: Have DownloadManager pass file URIs for legacy external downloads

Browse Source 
Merge commit 'bb0d23b5475cb516fa6f61ee3fe4e7b79cd980f8' into gingerbread-plus-aosp

* commit 'bb0d23b5475cb516fa6f61ee3fe4e7b79cd980f8':
  Have DownloadManager pass file URIs for legacy external downloads
This commit is contained in:
Steve Howard
2010-09-23 13:02:21 -07:00
committed by Android Git Automerger
parent 8449490a94 bb0d23b547
commit 1fd1129264
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -247,6 +247,7 @@ public class DownloadManager {
Downloads.COLUMN_LAST_MODIFICATION,
Downloads.COLUMN_DESTINATION,
Downloads.Impl.COLUMN_FILE_NAME_HINT,
Downloads.Impl._DATA,
};
private static final Set<String> LONG_COLUMNS = new HashSet<String>(
@@ -881,6 +882,11 @@ public class DownloadManager {
return getUnderlyingString(Downloads.Impl.COLUMN_FILE_NAME_HINT);
}
if (destinationType == Downloads.Impl.DESTINATION_EXTERNAL) {
// return stored destination for legacy external download
return Uri.fromFile(new File(getUnderlyingString(Downloads.Impl._DATA))).toString();
}
// return content URI for cache download
long downloadId = getUnderlyingLong(Downloads.Impl._ID);
return ContentUris.withAppendedId(mBaseUri, downloadId).toString();