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

am ca843039: am 439e2db3: am b86048da: Merge "Always return content Uri for downloads." into mnc-dev

Browse Source 
* commit 'ca843039278305a3610bd459bf971dd2a1879d27':
  Always return content Uri for downloads.
This commit is contained in:
Jeff Sharkey
2015-07-29 20:41:26 +00:00
committed by Android Git Automerger
parent 8fde12eb44 ca84303927
commit aa6c200281
1 changed files with 3 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1013,14 +1013,10 @@ public class DownloadManager {
/** /**
* Returns the {@link Uri} of the given downloaded file id, if the file is * Returns the {@link Uri} of the given downloaded file id, if the file is
* downloaded successfully. Otherwise, null is returned. * downloaded successfully. Otherwise, null is returned.
*<p>
* If the specified downloaded file is in external storage (for example, /sdcard dir),
* then it is assumed to be safe for anyone to read and the returned {@link Uri} corresponds
* to the filepath on sdcard.
* *
* @param id the id of the downloaded file. * @param id the id of the downloaded file.
* @return the {@link Uri} of the given downloaded file id, if download was successful. null * @return the {@link Uri} of the given downloaded file id, if download was
* otherwise. * successful. null otherwise.
*/ */
public Uri getUriForDownloadedFile(long id) { public Uri getUriForDownloadedFile(long id) {
// to check if the file is in cache, get its destination from the database // to check if the file is in cache, get its destination from the database
@@ -1034,24 +1030,7 @@ public class DownloadManager {
if (cursor.moveToFirst()) { if (cursor.moveToFirst()) {
int status = cursor.getInt(cursor.getColumnIndexOrThrow(COLUMN_STATUS)); int status = cursor.getInt(cursor.getColumnIndexOrThrow(COLUMN_STATUS));
if (DownloadManager.STATUS_SUCCESSFUL == status) { if (DownloadManager.STATUS_SUCCESSFUL == status) {
int indx = cursor.getColumnIndexOrThrow( return ContentUris.withAppendedId(Downloads.Impl.CONTENT_URI, id);
Downloads.Impl.COLUMN_DESTINATION);
int destination = cursor.getInt(indx);
// TODO: if we ever add API to DownloadManager to let the caller specify
// non-external storage for a downloaded file, then the following code
// should also check for that destination.
if (destination == Downloads.Impl.DESTINATION_CACHE_PARTITION ||
destination == Downloads.Impl.DESTINATION_SYSTEMCACHE_PARTITION ||
destination == Downloads.Impl.DESTINATION_CACHE_PARTITION_NOROAMING ||
destination == Downloads.Impl.DESTINATION_CACHE_PARTITION_PURGEABLE) {
// return private uri
return ContentUris.withAppendedId(Downloads.Impl.CONTENT_URI, id);
} else {
// return public uri
String path = cursor.getString(
cursor.getColumnIndexOrThrow(COLUMN_LOCAL_FILENAME));
return Uri.fromFile(new File(path));
}
} }
} }
} finally { } finally {