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

Commit f2260a77 authored by Azhara Assanova's avatar Azhara Assanova
Browse files

Correct documentation for requireContentUriPermissionFromCaller 

The Manifest attribute doesn't just apply to Context#startActivity, but
to any activity launch, hence this change corrects the Javadoc and the
Manifest doc of the attribute.

Bug: 293467489
Test: atest CtsContentTestCases:android.content.cts.ActivityRequireContentUriPermissionFromCallerTest
Change-Id: I85a72786949d63656465087fcd01fa73402ba5b4
parent 04892216

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
@@ -3285,10 +3285,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}.