diff options
| author | Jeff Sharkey <jsharkey@android.com> | 2016-09-16 16:57:34 -0600 |
|---|---|---|
| committer | The Android Automerger <android-build@android.com> | 2016-09-27 16:28:39 -0700 |
| commit | f653d365122f0cebc92ac7bb0af805cc4d80f638 (patch) | |
| tree | b10c1e310a5e3b1725731c750ad2cd6b54b50f44 /core | |
| parent | 4c95059c31584cbd5651183a4605301563cf2e8e (diff) | |
| download | frameworks_base-f653d365122f0cebc92ac7bb0af805cc4d80f638.zip frameworks_base-f653d365122f0cebc92ac7bb0af805cc4d80f638.tar.gz frameworks_base-f653d365122f0cebc92ac7bb0af805cc4d80f638.tar.bz2 | |
Merge commit '0a9d537f623b2c11dce707fb9b91fea016fd0e9f' into manual_merge_0a9d537
Change-Id: Ib1a0bbb34edb61666ac5739f0b0eaadbe4c5fe06
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/app/DownloadManager.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/core/java/android/app/DownloadManager.java b/core/java/android/app/DownloadManager.java index fb0e79b..12c851b 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) { |