Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add minOccurs="0"

Browse Source 
For privapp-permissions and oem-permissions elements, some xml files
don't need to permission and deny-permission properties. So add the
minOccurs="0" for these elements.

Test: vts-tradefed run vts -m VtsValidatePermission
Bug: 143251304
Change-Id: Ib93a40e646f9c65bd62d23396c12ea31f2d735d8
Merged-In: Ib93a40e646f9c65bd62d23396c12ea31f2d735d8
(cherry picked from commit 33bca5b12b)
This commit is contained in:
Sundong Ahn
2019-12-20 16:33:46 +09:00
parent ad615de885
commit 3ceb72e4ba
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/xsd/permission.xsd
View File

@@ -126,12 +126,12 @@
</xs:complexType>
<xs:complexType name="privapp-permissions">
<xs:sequence>
<xs:element name="permission" maxOccurs="unbounded">
<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" maxOccurs="unbounded">
<xs:element name="deny-permission" minOccurs="0" maxOccurs="unbounded">
<xs:complexType>
<xs:attribute name="name" type="xs:string"/>
</xs:complexType>
@@ -141,12 +141,12 @@
</xs:complexType>
<xs:complexType name="oem-permissions">
<xs:sequence>
<xs:element name="permission" maxOccurs="unbounded">
<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" maxOccurs="unbounded">
<xs:element name="deny-permission" minOccurs="0" maxOccurs="unbounded">
<xs:complexType>
<xs:attribute name="name" type="xs:string"/>
</xs:complexType>