summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jeff Sharkey <jsharkey@android.com> 2016-09-16 23:40:13 +0000
committer android-build-merger <android-build-merger@google.com> 2016-09-16 23:40:13 +0000
commit33ada2e9272024e549373ddae586cfaf01596d27 (patch)
tree67dee478c2a909a39da2833c64c8c58b691150ab
parentc9cf811b5086eda891997c6ce6615dcd6b571c51 (diff)
parentfc1c0f9dff983399fa41fad59c3356ed9646412d (diff)
Merge commit '0a9d537f623b2c11dce707fb9b91fea016fd0e9f' into manual_merge_0a9d537 am: df42d732f8 am: afcd1135c3
am: fc1c0f9dff Change-Id: I4c197be781f981af568ae98e1c3358ce8572e39a
-rw-r--r--core/java/android/app/DownloadManager.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/core/java/android/app/DownloadManager.java b/core/java/android/app/DownloadManager.java
index fb0e79b849b2..12c851b38fe5 100644
--- a/core/java/android/app/DownloadManager.java
+++ b/core/java/android/app/DownloadManager.java
@@ -1030,7 +1030,7 @@ public class DownloadManager {
if (cursor.moveToFirst()) {
int status = cursor.getInt(cursor.getColumnIndexOrThrow(COLUMN_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 {
@@ -1227,7 +1227,7 @@ public class DownloadManager {
* @hide
*/
public Uri getDownloadUri(long id) {
- return ContentUris.withAppendedId(mBaseUri, id);
+ return ContentUris.withAppendedId(Downloads.Impl.ALL_DOWNLOADS_CONTENT_URI, id);
}
/**
@@ -1308,7 +1308,7 @@ public class DownloadManager {
// return content URI for cache download
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) {