summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSundong Ahn <sundongahn@google.com>2019-12-20 16:33:46 +0900
committerSundong Ahn <sundongahn@google.com>2020-01-07 12:58:30 +0900
commit3ceb72e4ba32d290d4dbf31762eaa3e9cd857189 (patch)
tree5c874be864913adecc37c1431b873947252b54be
parentad615de885457e0d5aba128522ee86656f3f9ca1 (diff)
downloadbase-3ceb72e4ba32d290d4dbf31762eaa3e9cd857189.tar.gz
Add minOccurs="0"
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 33bca5b12b4df831cbd787374cf7d6be7fc362a9)
-rw-r--r--core/xsd/permission.xsd8
1 files changed, 4 insertions, 4 deletions
diff --git a/core/xsd/permission.xsd b/core/xsd/permission.xsd
index 9520db767350..cc01a31224bc 100644
--- a/core/xsd/permission.xsd
+++ b/core/xsd/permission.xsd
@@ -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>