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

Commit 8fcacb54 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Merge "Update XSD for signature permission allowlist" into... 

Merge "Merge "Update XSD for signature permission allowlist" into android15-tests-dev am: cb69258d" into main am: 444a2c58

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



Change-Id: Ie23106d7d43e131398e8815771f555f02d07fb8f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents fd3b8fa2 444a2c58

core/xsd/permission.xsd

+16 −0
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ 
                <xs:element name="disabled-until-used-preinstalled-carrier-app" type="disabled-until-used-preinstalled-carrier-app"/>

                <xs:element name="privapp-permissions" type="privapp-permissions"/>

                <xs:element name="oem-permissions" type="oem-permissions"/>

                <xs:element name="signature-permissions" type="signature-permissions"/>

                <xs:element name="hidden-api-whitelisted-app" type="hidden-api-whitelisted-app"/>

                <xs:element name="allow-association" type="allow-association"/>

                <xs:element name="bugreport-whitelisted" type="bugreport-whitelisted"/>
@@ -156,6 +157,21 @@ 
        </xs:sequence>

        <xs:attribute name="package" type="xs:string"/>

    </xs:complexType>

    <xs:complexType name="signature-permissions">

        <xs:sequence>

            <xs:element name="permission" minOccurs="0" maxOccurs="unbounded">

                <xs:complexType>

                    <xs:attribute name="name" type="xs:string"/>

                </xs:complexType>

            </xs:element>

            <xs:element name="deny-permission" minOccurs="0" maxOccurs="unbounded">

                <xs:complexType>

                    <xs:attribute name="name" type="xs:string"/>

                </xs:complexType>

            </xs:element>

        </xs:sequence>

        <xs:attribute name="package" type="xs:string"/>

    </xs:complexType>

    <xs:complexType name="hidden-api-whitelisted-app">

        <xs:attribute name="package" type="xs:string"/>

    </xs:complexType>

core/xsd/schema/current.txt

+21 −0
Original line number Diff line number Diff line
@@ -183,6 +183,7 @@ package com.android.xml.permission.configfile { 
    method public java.util.List<com.android.xml.permission.configfile.OemPermissions> getOemPermissions_optional();

    method public java.util.List<com.android.xml.permission.configfile.Permission> getPermission_optional();

    method public java.util.List<com.android.xml.permission.configfile.PrivappPermissions> getPrivappPermissions_optional();

    method public java.util.List<com.android.xml.permission.configfile.SignaturePermissions> getSignaturePermissions_optional();

    method public java.util.List<com.android.xml.permission.configfile.SplitPermission> getSplitPermission_optional();

    method public java.util.List<com.android.xml.permission.configfile.SystemUserBlacklistedApp> getSystemUserBlacklistedApp_optional();

    method public java.util.List<com.android.xml.permission.configfile.SystemUserWhitelistedApp> getSystemUserWhitelistedApp_optional();
@@ -209,6 +210,26 @@ package com.android.xml.permission.configfile { 
    method public void setName(String);

  }



  public class SignaturePermissions {

    ctor public SignaturePermissions();

    method public java.util.List<com.android.xml.permission.configfile.SignaturePermissions.DenyPermission> getDenyPermission();

    method public java.util.List<com.android.xml.permission.configfile.SignaturePermissions.Permission> getPermission();

    method public String get_package();

    method public void set_package(String);

  }



  public static class SignaturePermissions.DenyPermission {

    ctor public SignaturePermissions.DenyPermission();

    method public String getName();

    method public void setName(String);

  }



  public static class SignaturePermissions.Permission {

    ctor public SignaturePermissions.Permission();

    method public String getName();

    method public void setName(String);

  }



  public class SplitPermission {

    ctor public SplitPermission();

    method public java.util.List<com.android.xml.permission.configfile.SplitPermission.Library> getLibrary();