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

Commit b0679fed authored by Sundong Ahn's avatar Sundong Ahn Committed by android-build-merger
Browse files

Merge "Move the attribute tags" 

am: dcef50e2

Change-Id: Ie01976685722f8cecf847544d2c04a4ece49f3f6
parents 4f9c63ad dcef50e2

core/xsd/permission.xsd

+4 −4
Original line number Diff line number Diff line
@@ -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"/>