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

Commit 3875cc33 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Make ACTION_VIEW_PERMISSION_USAGE_FOR_PERIOD public" into sc-dev am:... 

Merge "Make ACTION_VIEW_PERMISSION_USAGE_FOR_PERIOD public" into sc-dev am: 8eb397fb am: 0a61fe7a

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14505697

Change-Id: I6f6b605039d8b56ba598e2516ab37c078489b2c2
parents 41448669 0a61fe7a

core/api/current.txt

+5 −0
Original line number Diff line number Diff line
@@ -11154,6 +11154,7 @@ package android.content { 
    field public static final String ACTION_VIEW = "android.intent.action.VIEW";

    field public static final String ACTION_VIEW_LOCUS = "android.intent.action.VIEW_LOCUS";

    field @RequiresPermission(android.Manifest.permission.START_VIEW_PERMISSION_USAGE) public static final String ACTION_VIEW_PERMISSION_USAGE = "android.intent.action.VIEW_PERMISSION_USAGE";

    field @RequiresPermission(android.Manifest.permission.START_VIEW_PERMISSION_USAGE) public static final String ACTION_VIEW_PERMISSION_USAGE_FOR_PERIOD = "android.intent.action.VIEW_PERMISSION_USAGE_FOR_PERIOD";

    field public static final String ACTION_VOICE_COMMAND = "android.intent.action.VOICE_COMMAND";

    field @Deprecated public static final String ACTION_WALLPAPER_CHANGED = "android.intent.action.WALLPAPER_CHANGED";

    field public static final String ACTION_WEB_SEARCH = "android.intent.action.WEB_SEARCH";
@@ -11206,6 +11207,7 @@ package android.content { 
    field public static final String EXTRA_ASSIST_INPUT_HINT_KEYBOARD = "android.intent.extra.ASSIST_INPUT_HINT_KEYBOARD";

    field public static final String EXTRA_ASSIST_PACKAGE = "android.intent.extra.ASSIST_PACKAGE";

    field public static final String EXTRA_ASSIST_UID = "android.intent.extra.ASSIST_UID";

    field public static final String EXTRA_ATTRIBUTION_TAGS = "android.intent.extra.ATTRIBUTION_TAGS";

    field public static final String EXTRA_AUTO_LAUNCH_SINGLE_CHOICE = "android.intent.extra.AUTO_LAUNCH_SINGLE_CHOICE";

    field public static final String EXTRA_BCC = "android.intent.extra.BCC";

    field public static final String EXTRA_BUG_REPORT = "android.intent.extra.BUG_REPORT";
@@ -11231,6 +11233,7 @@ package android.content { 
    field public static final String EXTRA_DONT_KILL_APP = "android.intent.extra.DONT_KILL_APP";

    field public static final String EXTRA_DURATION_MILLIS = "android.intent.extra.DURATION_MILLIS";

    field public static final String EXTRA_EMAIL = "android.intent.extra.EMAIL";

    field public static final String EXTRA_END_TIME = "android.intent.extra.END_TIME";

    field public static final String EXTRA_EXCLUDE_COMPONENTS = "android.intent.extra.EXCLUDE_COMPONENTS";

    field public static final String EXTRA_FROM_STORAGE = "android.intent.extra.FROM_STORAGE";

    field public static final String EXTRA_HTML_TEXT = "android.intent.extra.HTML_TEXT";
@@ -11245,6 +11248,7 @@ package android.content { 
    field public static final String EXTRA_NOT_UNKNOWN_SOURCE = "android.intent.extra.NOT_UNKNOWN_SOURCE";

    field public static final String EXTRA_ORIGINATING_URI = "android.intent.extra.ORIGINATING_URI";

    field public static final String EXTRA_PACKAGE_NAME = "android.intent.extra.PACKAGE_NAME";

    field public static final String EXTRA_PERMISSION_GROUP_NAME = "android.intent.extra.PERMISSION_GROUP_NAME";

    field public static final String EXTRA_PHONE_NUMBER = "android.intent.extra.PHONE_NUMBER";

    field public static final String EXTRA_PROCESS_TEXT = "android.intent.extra.PROCESS_TEXT";

    field public static final String EXTRA_PROCESS_TEXT_READONLY = "android.intent.extra.PROCESS_TEXT_READONLY";
@@ -11267,6 +11271,7 @@ package android.content { 
    field @Deprecated public static final String EXTRA_SHORTCUT_NAME = "android.intent.extra.shortcut.NAME";

    field public static final String EXTRA_SHUTDOWN_USERSPACE_ONLY = "android.intent.extra.SHUTDOWN_USERSPACE_ONLY";

    field public static final String EXTRA_SPLIT_NAME = "android.intent.extra.SPLIT_NAME";

    field public static final String EXTRA_START_TIME = "android.intent.extra.START_TIME";

    field public static final String EXTRA_STREAM = "android.intent.extra.STREAM";

    field public static final String EXTRA_SUBJECT = "android.intent.extra.SUBJECT";

    field public static final String EXTRA_SUSPENDED_PACKAGE_EXTRAS = "android.intent.extra.SUSPENDED_PACKAGE_EXTRAS";

core/api/system-current.txt

+0 −5
Original line number Diff line number Diff line
@@ -2399,12 +2399,9 @@ package android.content { 
    field public static final String ACTION_UPGRADE_SETUP = "android.intent.action.UPGRADE_SETUP";

    field public static final String ACTION_USER_ADDED = "android.intent.action.USER_ADDED";

    field public static final String ACTION_USER_REMOVED = "android.intent.action.USER_REMOVED";

    field @RequiresPermission(android.Manifest.permission.START_VIEW_PERMISSION_USAGE) public static final String ACTION_VIEW_PERMISSION_USAGE_FOR_PERIOD = "android.intent.action.VIEW_PERMISSION_USAGE_FOR_PERIOD";

    field public static final String ACTION_VOICE_ASSIST = "android.intent.action.VOICE_ASSIST";

    field public static final String CATEGORY_LEANBACK_SETTINGS = "android.intent.category.LEANBACK_SETTINGS";

    field public static final String EXTRA_ATTRIBUTION_TAGS = "android.intent.extra.ATTRIBUTION_TAGS";

    field public static final String EXTRA_CALLING_PACKAGE = "android.intent.extra.CALLING_PACKAGE";

    field public static final String EXTRA_END_TIME = "android.intent.extra.END_TIME";

    field public static final String EXTRA_FORCE_FACTORY_RESET = "android.intent.extra.FORCE_FACTORY_RESET";

    field public static final String EXTRA_INSTANT_APP_ACTION = "android.intent.extra.INSTANT_APP_ACTION";

    field public static final String EXTRA_INSTANT_APP_BUNDLES = "android.intent.extra.INSTANT_APP_BUNDLES";
@@ -2416,13 +2413,11 @@ package android.content { 
    field public static final String EXTRA_LONG_VERSION_CODE = "android.intent.extra.LONG_VERSION_CODE";

    field public static final String EXTRA_ORIGINATING_UID = "android.intent.extra.ORIGINATING_UID";

    field public static final String EXTRA_PACKAGES = "android.intent.extra.PACKAGES";

    field public static final String EXTRA_PERMISSION_GROUP_NAME = "android.intent.extra.PERMISSION_GROUP_NAME";

    field public static final String EXTRA_PERMISSION_NAME = "android.intent.extra.PERMISSION_NAME";

    field public static final String EXTRA_REASON = "android.intent.extra.REASON";

    field public static final String EXTRA_REMOTE_CALLBACK = "android.intent.extra.REMOTE_CALLBACK";

    field public static final String EXTRA_RESULT_NEEDED = "android.intent.extra.RESULT_NEEDED";

    field public static final String EXTRA_ROLE_NAME = "android.intent.extra.ROLE_NAME";

    field public static final String EXTRA_START_TIME = "android.intent.extra.START_TIME";

    field public static final String EXTRA_UNKNOWN_INSTANT_APP = "android.intent.extra.UNKNOWN_INSTANT_APP";

    field public static final String EXTRA_VERIFICATION_BUNDLE = "android.intent.extra.VERIFICATION_BUNDLE";

    field public static final int FLAG_RECEIVER_REGISTERED_ONLY_BEFORE_BOOT = 67108864; // 0x4000000

core/java/android/content/Intent.java

+0 −17
Original line number Diff line number Diff line
@@ -2022,12 +2022,9 @@ public class Intent implements Parcelable, Cloneable { 
     * <p>

     * Output: Nothing.

     * </p>

     *

     * @hide

     */

    @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)

    @RequiresPermission(android.Manifest.permission.START_VIEW_PERMISSION_USAGE)

    @SystemApi

    public static final String ACTION_VIEW_PERMISSION_USAGE_FOR_PERIOD =

            "android.intent.action.VIEW_PERMISSION_USAGE_FOR_PERIOD";
@@ -2188,12 +2185,7 @@ public class Intent implements Parcelable, Cloneable { 
     * <p>

     * Type: String

     * </p>

     *

     * E.g. {@link android.Manifest.permission_group.CONTACTS}

     *

     * @hide

     */

    @SystemApi

    public static final String EXTRA_PERMISSION_GROUP_NAME =

            "android.intent.extra.PERMISSION_GROUP_NAME";
@@ -5342,28 +5334,19 @@ public class Intent implements Parcelable, Cloneable { 
     * {@link #ACTION_VIEW_PERMISSION_USAGE_FOR_PERIOD}

     *

     * E.g. an attribution tag could be location_provider, com.google.android.gms.*, etc.

     *

     * @hide

     */

    @SystemApi

    public static final String EXTRA_ATTRIBUTION_TAGS = "android.intent.extra.ATTRIBUTION_TAGS";



    /**

     * A long representing the start timestamp (epoch time in millis) of the permission usage

     * when used with {@link #ACTION_VIEW_PERMISSION_USAGE_FOR_PERIOD}

     *

     * @hide

     */

    @SystemApi

    public static final String EXTRA_START_TIME = "android.intent.extra.START_TIME";



    /**

     * A long representing the end timestamp (epoch time in millis) of the permission usage when

     * used with {@link #ACTION_VIEW_PERMISSION_USAGE_FOR_PERIOD}

     *

     * @hide

     */

    @SystemApi

    public static final String EXTRA_END_TIME = "android.intent.extra.END_TIME";



    /**