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

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

RESTRICT AUTOMERGE Enable stricter SQLiteQueryBuilder options. 

am: f683c688

Change-Id: I64ae89ecc92127de21503fbcfdd34c60a6f620bc
parents b0054f05 f683c688

core/java/android/app/DownloadManager.java

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

     */

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

    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

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

     * {@link #COLUMN_STATUS}.

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

     */

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

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





    /** {@hide} */

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



    /**

    /**

     * @hide

     * @hide

     */

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

     * @hide

     */

     */

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

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

        Downloads.Impl._ID,

        DownloadManager.COLUMN_ID,

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

        DownloadManager.COLUMN_LOCAL_FILENAME,

        Downloads.Impl.COLUMN_MEDIAPROVIDER_URI,

        DownloadManager.COLUMN_MEDIAPROVIDER_URI,

        Downloads.Impl.COLUMN_DESTINATION,

        DownloadManager.COLUMN_DESTINATION,

        Downloads.Impl.COLUMN_TITLE,

        DownloadManager.COLUMN_TITLE,

        Downloads.Impl.COLUMN_DESCRIPTION,

        DownloadManager.COLUMN_DESCRIPTION,

        Downloads.Impl.COLUMN_URI,

        DownloadManager.COLUMN_URI,

        Downloads.Impl.COLUMN_STATUS,

        DownloadManager.COLUMN_STATUS,

        Downloads.Impl.COLUMN_FILE_NAME_HINT,

        DownloadManager.COLUMN_FILE_NAME_HINT,

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

        DownloadManager.COLUMN_MEDIA_TYPE,

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

        DownloadManager.COLUMN_TOTAL_SIZE_BYTES,

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

        DownloadManager.COLUMN_LAST_MODIFIED_TIMESTAMP,

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

        DownloadManager.COLUMN_BYTES_DOWNLOADED_SO_FAR,

        Downloads.Impl.COLUMN_ALLOW_WRITE,

        DownloadManager.COLUMN_ALLOW_WRITE,

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

        DownloadManager.COLUMN_LOCAL_URI,

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

        DownloadManager.COLUMN_REASON

         * eliminates need to have lot of methods in CursorTranslator

         */

        "'placeholder' AS " + COLUMN_LOCAL_URI,

        "'placeholder' AS " + COLUMN_REASON

    };

    };





    /**

    /**