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

Merge "Move the attribute tags"

Browse Source 
am: dcef50e27d

Change-Id: Ie01976685722f8cecf847544d2c04a4ece49f3f6
This commit is contained in:
Sundong Ahn
2019-03-28 01:08:03 -07:00
committed by android-build-merger
parent 4f9c63ad1d dcef50e27d
commit b0679fed6c
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

@@ -60,8 +60,6 @@
<xs:attribute name="uid" type="xs:int"/> <xs:attribute name="uid" type="xs:int"/>
</xs:complexType> </xs:complexType>
<xs:complexType name="split-permission"> <xs:complexType name="split-permission">
<xs:attribute name="name" type="xs:string"/>
<xs:attribute name="targetSdk" type="xs:int"/>
<xs:sequence> <xs:sequence>
<xs:element name="library" maxOccurs="unbounded"> <xs:element name="library" maxOccurs="unbounded">
<xs:complexType> <xs:complexType>
@@ -69,6 +67,8 @@
</xs:complexType> </xs:complexType>
</xs:element> </xs:element>
</xs:sequence> </xs:sequence>
<xs:attribute name="name" type="xs:string"/>
<xs:attribute name="targetSdk" type="xs:int"/>
</xs:complexType> </xs:complexType>
<xs:complexType name="library"> <xs:complexType name="library">
<xs:attribute name="name" type="xs:string"/> <xs:attribute name="name" type="xs:string"/>
@@ -124,7 +124,6 @@
<xs:attribute name="package" type="xs:string"/> <xs:attribute name="package" type="xs:string"/>
</xs:complexType> </xs:complexType>
<xs:complexType name="privapp-permissions"> <xs:complexType name="privapp-permissions">
<xs:attribute name="package" type="xs:string"/>
<xs:sequence> <xs:sequence>
<xs:element name="permission" maxOccurs="unbounded"> <xs:element name="permission" maxOccurs="unbounded">
<xs:complexType> <xs:complexType>
@@ -137,9 +136,9 @@
</xs:complexType> </xs:complexType>
</xs:element> </xs:element>
</xs:sequence> </xs:sequence>
<xs:attribute name="package" type="xs:string"/>
</xs:complexType> </xs:complexType>
<xs:complexType name="oem-permissions"> <xs:complexType name="oem-permissions">
<xs:attribute name="package" type="xs:string"/>
<xs:sequence> <xs:sequence>
<xs:element name="permission" maxOccurs="unbounded"> <xs:element name="permission" maxOccurs="unbounded">
<xs:complexType> <xs:complexType>
@@ -152,6 +151,7 @@
</xs:complexType> </xs:complexType>
</xs:element> </xs:element>
</xs:sequence> </xs:sequence>
<xs:attribute name="package" type="xs:string"/>
</xs:complexType> </xs:complexType>
<xs:complexType name="hidden-api-whitelisted-app"> <xs:complexType name="hidden-api-whitelisted-app">
<xs:attribute name="package" type="xs:string"/> <xs:attribute name="package" type="xs:string"/>