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

Commit 2b217a00 authored by Azhara Assanova's avatar Azhara Assanova Committed by Android (Google) Code Review
Browse files

Merge "Correct documentation for requireContentUriPermissionFromCaller" into main

parents 7b05e435 f2260a77

core/java/android/content/pm/ActivityInfo.java

+3 −4
Original line number Diff line number Diff line
@@ -333,10 +333,9 @@ public class ActivityInfo extends ComponentInfo implements Parcelable { 
    }



    /**

     * Specifies permissions necessary to launch this activity via

     * {@link android.content.Context#startActivity} when passing content URIs. The default value is

     * {@code none}, meaning no specific permissions are required. Setting this attribute restricts

     * activity invocation based on the invoker's permissions.

     * Specifies permissions necessary to launch this activity when passing content URIs. The

     * default value is {@code none}, meaning no specific permissions are required. Setting this

     * attribute restricts activity invocation based on the invoker's permissions.

     * @hide

     */

    @RequiredContentUriPermission

core/res/res/values/attrs_manifest.xml

+3 −4
Original line number Diff line number Diff line
@@ -3287,10 +3287,9 @@ 
        -->

        <attr name="enableOnBackInvokedCallback" format="boolean"/>



        <!-- Specifies permissions necessary to launch this activity via

             {@link android.content.Context#startActivity} when passing content URIs. The default

             value is {@code none}, meaning no specific permissions are required. Setting this

             attribute restricts activity invocation based on the invoker's permissions. If the

        <!-- Specifies permissions necessary to launch this activity when passing content URIs. The

             default value is {@code none}, meaning no specific permissions are required. Setting

             this attribute restricts activity invocation based on the invoker's permissions. If the

             invoker doesn't have the required permissions, the activity start will be denied via a

             {@link java.lang.SecurityException}.