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

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

Merge "Add examples for EXTRA_PERMISSION_GROUP_NAME and... 

Merge "Add examples for EXTRA_PERMISSION_GROUP_NAME and EXTRA_ATTRIBUTION_TAGS" into sc-dev am: de1232b3

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

Change-Id: I2195ac60354f9bc086918c7ace0da79b25a219be
parents 5fc5597b de1232b3

core/java/android/content/Intent.java

+4 −0
Original line number Diff line number Diff line
@@ -2189,6 +2189,8 @@ public class Intent implements Parcelable, Cloneable { 
     * Type: String

     * </p>

     *

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

     *

     * @hide

     */

    @SystemApi
@@ -5339,6 +5341,8 @@ public class Intent implements Parcelable, Cloneable { 
     * A String[] holding attribution tags when used with

     * {@link #ACTION_VIEW_PERMISSION_USAGE_FOR_PERIOD}

     *

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

     *

     * @hide

     */

    @SystemApi