Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 33ada2e9 authored by Jeff Sharkey's avatar Jeff Sharkey Committed by android-build-merger
Browse files

Merge commit '0a9d537f' into... 

Merge commit '0a9d537f' into manual_merge_0a9d537 am: df42d732 am: afcd1135
am: fc1c0f9d

Change-Id: I4c197be781f981af568ae98e1c3358ce8572e39a
parents c9cf811b fc1c0f9d

core/java/android/app/DownloadManager.java

+3 −3
Original line number Diff line number Diff line
@@ -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) {