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

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

Merge "Add legacy DownloadManager actions to SystemApi." into oc-dev 

am: cd776616

Change-Id: I8ce4e00a78c4ac4b3ffd783bccee10855fa19df0
parents 7c3db61d cd776616

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -4622,6 +4622,7 @@ package android.app { 
    method public android.database.Cursor query(android.app.DownloadManager.Query);

    method public int remove(long...);

    field public static final java.lang.String ACTION_DOWNLOAD_COMPLETE = "android.intent.action.DOWNLOAD_COMPLETE";

    field public static final java.lang.String ACTION_DOWNLOAD_COMPLETED = "android.intent.action.DOWNLOAD_COMPLETED";

    field public static final java.lang.String ACTION_NOTIFICATION_CLICKED = "android.intent.action.DOWNLOAD_NOTIFICATION_CLICKED";

    field public static final java.lang.String ACTION_VIEW_DOWNLOADS = "android.intent.action.VIEW_DOWNLOADS";

    field public static final java.lang.String COLUMN_BYTES_DOWNLOADED_SO_FAR = "bytes_so_far";

core/java/android/app/DownloadManager.java

+6 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package android.app; 


import android.annotation.Nullable;

import android.annotation.SdkConstant;

import android.annotation.SystemApi;

import android.annotation.SdkConstant.SdkConstantType;

import android.content.ContentResolver;

import android.content.ContentUris;
@@ -321,6 +322,11 @@ public class DownloadManager { 
     */

    public static final String EXTRA_NOTIFICATION_CLICK_DOWNLOAD_IDS = "extra_click_download_ids";



    /** {@hide} */

    @SystemApi

    public static final String ACTION_DOWNLOAD_COMPLETED =

            "android.intent.action.DOWNLOAD_COMPLETED";



    /**

     * columns to request from DownloadProvider.

     * @hide

core/java/android/provider/Downloads.java

+2 −2
Original line number Diff line number Diff line
@@ -114,7 +114,7 @@ public final class Downloads { 
         * download's content: uri is specified in the intent's data.

         */

        public static final String ACTION_DOWNLOAD_COMPLETED =

                "android.intent.action.DOWNLOAD_COMPLETED";

                DownloadManager.ACTION_DOWNLOAD_COMPLETED;



        /**

         * Broadcast Action: this is sent by the download manager to the app
@@ -127,7 +127,7 @@ public final class Downloads { 
         * successfully.

         */

        public static final String ACTION_NOTIFICATION_CLICKED =

                "android.intent.action.DOWNLOAD_NOTIFICATION_CLICKED";

                DownloadManager.ACTION_NOTIFICATION_CLICKED;



        /**

         * The name of the column containing the URI of the data being downloaded.