diff options
| author | 2019-03-28 01:26:44 -0700 | |
|---|---|---|
| committer | 2019-03-28 01:26:44 -0700 | |
| commit | 805e4a07cd19cc2a4af672fa8748605e1be4aab1 (patch) | |
| tree | 3a757b81314d00ccb927d597a6fd14e67b619344 | |
| parent | 50b1abc246069f4b4681bcea188eede08156dfae (diff) | |
| parent | 8dcfc05b9767264fcb889c2c738b37f64dbfe199 (diff) | |
Merge "Move the attribute tags" am: dcef50e27d am: b0679fed6c
am: 8dcfc05b97
Change-Id: I94b4c89ee60014a3a9bc184009a5c479c1ee0743
| -rw-r--r-- | core/xsd/permission.xsd | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/core/xsd/permission.xsd b/core/xsd/permission.xsd index d90863b2c716..12281242e9f7 100644 --- a/core/xsd/permission.xsd +++ b/core/xsd/permission.xsd @@ -60,8 +60,6 @@ <xs:attribute name="uid" type="xs:int"/> </xs:complexType> <xs:complexType name="split-permission"> - <xs:attribute name="name" type="xs:string"/> - <xs:attribute name="targetSdk" type="xs:int"/> <xs:sequence> <xs:element name="library" maxOccurs="unbounded"> <xs:complexType> @@ -69,6 +67,8 @@ </xs:complexType> </xs:element> </xs:sequence> + <xs:attribute name="name" type="xs:string"/> + <xs:attribute name="targetSdk" type="xs:int"/> </xs:complexType> <xs:complexType name="library"> <xs:attribute name="name" type="xs:string"/> @@ -124,7 +124,6 @@ <xs:attribute name="package" type="xs:string"/> </xs:complexType> <xs:complexType name="privapp-permissions"> - <xs:attribute name="package" type="xs:string"/> <xs:sequence> <xs:element name="permission" maxOccurs="unbounded"> <xs:complexType> @@ -137,9 +136,9 @@ </xs:complexType> </xs:element> </xs:sequence> + <xs:attribute name="package" type="xs:string"/> </xs:complexType> <xs:complexType name="oem-permissions"> - <xs:attribute name="package" type="xs:string"/> <xs:sequence> <xs:element name="permission" maxOccurs="unbounded"> <xs:complexType> @@ -152,6 +151,7 @@ </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"/> |