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

Commit f8a2d069 authored by Jeff Sharkey's avatar Jeff Sharkey Committed by Android (Google) Code Review
Browse files

Merge "RESTRICT AUTOMERGE Enable stricter SQLiteQueryBuilder options." into oc-dev

parents 7633a081 f683c688

core/java/android/app/DownloadManager.java

+22 −20
Original line number Diff line number Diff line
@@ -127,6 +127,9 @@ public class DownloadManager { 
     */

    public final static String COLUMN_STATUS = Downloads.Impl.COLUMN_STATUS;



    /** {@hide} */

    public static final String COLUMN_FILE_NAME_HINT = Downloads.Impl.COLUMN_FILE_NAME_HINT;



    /**

     * Provides more detail on the status of the download.  Its meaning depends on the value of

     * {@link #COLUMN_STATUS}.
@@ -164,6 +167,9 @@ public class DownloadManager { 
     */

    public static final String COLUMN_MEDIAPROVIDER_URI = Downloads.Impl.COLUMN_MEDIAPROVIDER_URI;



    /** {@hide} */

    public static final String COLUMN_DESTINATION = Downloads.Impl.COLUMN_DESTINATION;



    /**

     * @hide

     */
@@ -330,26 +336,22 @@ public class DownloadManager { 
     * @hide

     */

    public static final String[] UNDERLYING_COLUMNS = new String[] {

        Downloads.Impl._ID,

        Downloads.Impl._DATA + " AS " + COLUMN_LOCAL_FILENAME,

        Downloads.Impl.COLUMN_MEDIAPROVIDER_URI,

        Downloads.Impl.COLUMN_DESTINATION,

        Downloads.Impl.COLUMN_TITLE,

        Downloads.Impl.COLUMN_DESCRIPTION,

        Downloads.Impl.COLUMN_URI,

        Downloads.Impl.COLUMN_STATUS,

        Downloads.Impl.COLUMN_FILE_NAME_HINT,

        Downloads.Impl.COLUMN_MIME_TYPE + " AS " + COLUMN_MEDIA_TYPE,

        Downloads.Impl.COLUMN_TOTAL_BYTES + " AS " + COLUMN_TOTAL_SIZE_BYTES,

        Downloads.Impl.COLUMN_LAST_MODIFICATION + " AS " + COLUMN_LAST_MODIFIED_TIMESTAMP,

        Downloads.Impl.COLUMN_CURRENT_BYTES + " AS " + COLUMN_BYTES_DOWNLOADED_SO_FAR,

        Downloads.Impl.COLUMN_ALLOW_WRITE,

        /* add the following 'computed' columns to the cursor.

         * they are not 'returned' by the database, but their inclusion

         * eliminates need to have lot of methods in CursorTranslator

         */

        "'placeholder' AS " + COLUMN_LOCAL_URI,

        "'placeholder' AS " + COLUMN_REASON

        DownloadManager.COLUMN_ID,

        DownloadManager.COLUMN_LOCAL_FILENAME,

        DownloadManager.COLUMN_MEDIAPROVIDER_URI,

        DownloadManager.COLUMN_DESTINATION,

        DownloadManager.COLUMN_TITLE,

        DownloadManager.COLUMN_DESCRIPTION,

        DownloadManager.COLUMN_URI,

        DownloadManager.COLUMN_STATUS,

        DownloadManager.COLUMN_FILE_NAME_HINT,

        DownloadManager.COLUMN_MEDIA_TYPE,

        DownloadManager.COLUMN_TOTAL_SIZE_BYTES,

        DownloadManager.COLUMN_LAST_MODIFIED_TIMESTAMP,

        DownloadManager.COLUMN_BYTES_DOWNLOADED_SO_FAR,

        DownloadManager.COLUMN_ALLOW_WRITE,

        DownloadManager.COLUMN_LOCAL_URI,

        DownloadManager.COLUMN_REASON

    };



    /**