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

Commit d8a818fb authored by Jeff Sharkey's avatar Jeff Sharkey Committed by Jessica Wagantall
Browse files

Use "all_downloads" instead of "my_downloads". 

We can no longer return the "my_downloads" paths: if those Uris were
shared beyond the app that requested the download, access would be
denied.  Instead, we need to switch to using "all_downloads" Uris so
that permission grants can be issued to third-party viewer apps.

Since an app requesting a download doesn't normally have permission
to "all_downloads" paths, DownloadProvider now issues narrow grants
toward the owner of each download, both at device boot and when new
downloads are started.

CYNGNOS-3303
Bug: 30537115, 30945409
Change-Id: I533125b36444877f54373d88922f2acc777e250b
parent 373c3e60

core/java/android/app/DownloadManager.java

+20 −3
Original line number Diff line number Diff line
@@ -1030,7 +1030,24 @@ 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);

                    int indx = cursor.getColumnIndexOrThrow(

                            Downloads.Impl.COLUMN_DESTINATION);

                    int destination = cursor.getInt(indx);

                    // TODO: if we ever add API to DownloadManager to let the caller specify

                    // non-external storage for a downloaded file, then the following code

                    // should also check for that destination.

                    if (destination == Downloads.Impl.DESTINATION_CACHE_PARTITION ||

                            destination == Downloads.Impl.DESTINATION_SYSTEMCACHE_PARTITION ||

                            destination == Downloads.Impl.DESTINATION_CACHE_PARTITION_NOROAMING ||

                            destination == Downloads.Impl.DESTINATION_CACHE_PARTITION_PURGEABLE) {

                        // return private uri

                        return ContentUris.withAppendedId(Downloads.Impl.ALL_DOWNLOADS_CONTENT_URI, id);

                    } else {

                        // return public uri

                        String path = cursor.getString(

                                cursor.getColumnIndexOrThrow(COLUMN_LOCAL_FILENAME));

                        return Uri.fromFile(new File(path));

                    }

                }

            }

        } finally {
@@ -1227,7 +1244,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 +1325,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) {