Merge commit '0a9d537f623b2c11dce707fb9b91fea016fd0e9f' into manual_merge_0a9d537

jsharkey · The Android Automerger · commit f653d365122f · 2016-09-27T16:28:39.000-07:00
Change-Id: Ib1a0bbb34edb61666ac5739f0b0eaadbe4c5fe06
diff --git a/core/java/android/app/DownloadManager.java b/core/java/android/app/DownloadManager.java
@@ -1030,7 +1030,7 @@ public Uri getUriForDownloadedFile(long id) {
             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 @@ private static void validateArgumentIsNonEmpty(String paramName, String val) {
      * @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 @@ private String getLocalUri() {
 
             // 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) {

Original file line number	Diff line number	Diff line change
`@@ -1030,7 +1030,7 @@ public Uri getUriForDownloadedFile(long id) {`
`1030`	`1030`	`if (cursor.moveToFirst()) {`
`1031`	`1031`	`int status = cursor.getInt(cursor.getColumnIndexOrThrow(COLUMN_STATUS));`
`1032`	`1032`	`if (DownloadManager.STATUS_SUCCESSFUL == status) {`
`1033`		`- return ContentUris.withAppendedId(Downloads.Impl.CONTENT_URI, id);`
	`1033`	`+ return ContentUris.withAppendedId(Downloads.Impl.ALL_DOWNLOADS_CONTENT_URI, id);`
`1034`	`1034`	`}`
`1035`	`1035`	`}`
`1036`	`1036`	`} finally {`
`@@ -1227,7 +1227,7 @@ private static void validateArgumentIsNonEmpty(String paramName, String val) {`
`1227`	`1227`	`* @hide`
`1228`	`1228`	`*/`
`1229`	`1229`	`public Uri getDownloadUri(long id) {`
`1230`		`- return ContentUris.withAppendedId(mBaseUri, id);`
	`1230`	`+ return ContentUris.withAppendedId(Downloads.Impl.ALL_DOWNLOADS_CONTENT_URI, id);`
`1231`	`1231`	`}`
`1232`	`1232`
`1233`	`1233`	`/**`
`@@ -1308,7 +1308,7 @@ private String getLocalUri() {`
`1308`	`1308`
`1309`	`1309`	`// return content URI for cache download`
`1310`	`1310`	`long downloadId = getLong(getColumnIndex(Downloads.Impl._ID));`
`1311`		`- return ContentUris.withAppendedId(mBaseUri, downloadId).toString();`
	`1311`	`+ return ContentUris.withAppendedId(Downloads.Impl.ALL_DOWNLOADS_CONTENT_URI, downloadId).toString();`
`1312`	`1312`	`}`
`1313`	`1313`
`1314`	`1314`	`private long getReason(int status) {`