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

Commit 435ef593 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Make it invalid for a permission to require purpose without specifying... 

Merge "Make it invalid for a permission to require purpose without specifying at least one valid purpose." into main
parents 6cdc5cd2 6545b4f5

core/java/com/android/internal/pm/pkg/component/ComponentParseUtils.java

+7 −3
Original line number Diff line number Diff line
@@ -98,11 +98,15 @@ public class ComponentParseUtils { 
            }

        }



        if (!validPurposes.isEmpty()) {

            // There can only be valid purposes if component is an instance of ParsedPermissionImpl.

        if (shouldParseValidPurposes) {

            final ParsedPermissionImpl permission = (ParsedPermissionImpl) component;

            if (permission.isPurposeRequired() && validPurposes.isEmpty()) {

                return input.error(

                        "<permission> requires purpose but no valid purpose defined!");

            } else {

                permission.setValidPurposes(validPurposes);

            }

        }



        return input.success(component);

    }

core/res/res/values/attrs_manifest.xml

+2 −2
Original line number Diff line number Diff line
@@ -2445,8 +2445,8 @@ 
        <!-- Optional: specify if valid purpose is required for this permission. True indicates

             it is required, false or not specifying the element indicates optional.



             <p>If set to true, use {@link #AndroidManifestValidPurpose valid-purpose} tag to

             specify the valid set of purpose(s). As a result of doing that, to prevent automatic

             <p>If set to true, {@link #AndroidManifestValidPurpose valid-purpose} tag must be used

             to specify at least one valid purpose. As a result of doing that, to prevent automatic

             revocation at install time, all permission requests made using the

             {@link #AndroidManifestUsesPermission uses-permission} tag will need to specify at

             least one of these configured valid purposes. This enforcement of purpose validation