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

Commit 1fb18f2a authored by Android Build Merger (Role)'s avatar Android Build Merger (Role) Committed by Android (Google) Code Review
Browse files

Merge changes from topic "am-ee703ed9cd18424088a6a5e4658900c5" into qt-qpr1-dev-plus-aosp 

* changes:
  Merge changes from topic "bp-135269143-q" into qt-dev am: 660c3b11 am: 58f72522 am: 0443c694
  RESTRICT AUTOMERGE Strict SQLiteQueryBuilder needs to be stricter. am: 0e66ea6f am: 71765a75 am: 404ea778
parents b9d7763e f1659075

core/java/android/app/DownloadManager.java

+22 −20
Original line number Diff line number Diff line
@@ -132,6 +132,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}.
@@ -173,6 +176,9 @@ public class DownloadManager { 
    @TestApi

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



    /** {@hide} */

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



    /**

     * @hide

     */
@@ -340,26 +346,22 @@ public class DownloadManager { 
     */

    @UnsupportedAppUsage

    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

    };



    /**

core/java/android/database/sqlite/SQLiteQueryBuilder.java

+327 −78

File changed.

Preview size limit exceeded, changes collapsed.

core/java/android/database/sqlite/SQLiteTokenizer.java

0 → 100644
+297 −0

File added.

Preview size limit exceeded, changes collapsed.

core/tests/coretests/src/android/database/sqlite/SQLiteTokenizerTest.java

0 → 100644
+173 −0

File added.

Preview size limit exceeded, changes collapsed.