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

Merge commit '0a9d537f623b2c11dce707fb9b91fea016fd0e9f' into manual_merge_0a9d537 am: df42d732f8 am: afcd1135c3 am: fc1c0f9dff am: 33ada2e927 am: db901ee296

Browse Source 
am: 6495c5ef30

Change-Id: I0e5463ab40cbea425badf360388d316a50299dd0
This commit is contained in:
Jeff Sharkey
2016-09-17 00:34:52 +00:00
committed by android-build-merger
parent c2145f0607 6495c5ef30
commit ec0933c4bf
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1089,7 +1089,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) {
return ContentUris.withAppendedId(Downloads.Impl.CONTENT_URI, id); return ContentUris.withAppendedId(Downloads.Impl.ALL_DOWNLOADS_CONTENT_URI, id);
} }
} }
} finally { } finally {
@@ -1425,7 +1425,7 @@ public class DownloadManager {
* @hide * @hide
*/ */
public Uri getDownloadUri(long id) { public Uri getDownloadUri(long id) {
return ContentUris.withAppendedId(mBaseUri, id); return ContentUris.withAppendedId(Downloads.Impl.ALL_DOWNLOADS_CONTENT_URI, id);
} }
/** /**
@@ -1519,7 +1519,7 @@ public class DownloadManager {
// return content URI for cache download // return content URI for cache download
long downloadId = getLong(getColumnIndex(Downloads.Impl._ID)); long downloadId = getLong(getColumnIndex(Downloads.Impl._ID));
return ContentUris.withAppendedId(mBaseUri, downloadId).toString(); return ContentUris.withAppendedId(Downloads.Impl.ALL_DOWNLOADS_CONTENT_URI, downloadId).toString();
} }
private long getReason(int status) { private long getReason(int status) {