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

Commit 4dd28c02 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge changes from topic "default_permissions" 

* changes:
  Change the package name
  Add maxOccurs
parents b9ef4dd2 ea075265

core/xsd/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -2,5 +2,5 @@ xsd_config { 
    name: "permission",

    srcs: ["permission.xsd"],

    api_dir: "schema",

    package_name: "com.android.xml.permission",

    package_name: "com.android.xml.permission.configfile",

}

core/xsd/schema/current.txt

+32 −32
Original line number Diff line number Diff line 
// Signature format: 2.0

package com.android.xml.permission {

package com.android.xml.permission.configfile {



  public class AllowAssociation {

    ctor public AllowAssociation();
@@ -125,8 +125,8 @@ package com.android.xml.permission { 


  public class OemPermissions {

    ctor public OemPermissions();

    method public java.util.List<com.android.xml.permission.OemPermissions.DenyPermission> getDenyPermission();

    method public java.util.List<com.android.xml.permission.OemPermissions.Permission> getPermission();

    method public java.util.List<com.android.xml.permission.configfile.OemPermissions.DenyPermission> getDenyPermission();

    method public java.util.List<com.android.xml.permission.configfile.OemPermissions.Permission> getPermission();

    method public String get_package();

    method public void set_package(String);

  }
@@ -151,37 +151,37 @@ package com.android.xml.permission { 


  public class Permissions {

    ctor public Permissions();

    method public java.util.List<com.android.xml.permission.AllowAssociation> getAllowAssociation();

    method public java.util.List<com.android.xml.permission.AllowIgnoreLocationSettings> getAllowIgnoreLocationSettings();

    method public java.util.List<com.android.xml.permission.AllowImplicitBroadcast> getAllowImplicitBroadcast();

    method public java.util.List<com.android.xml.permission.AllowInDataUsageSave> getAllowInDataUsageSave();

    method public java.util.List<com.android.xml.permission.AllowInPowerSave> getAllowInPowerSave();

    method public java.util.List<com.android.xml.permission.AllowInPowerSaveExceptIdle> getAllowInPowerSaveExceptIdle();

    method public java.util.List<com.android.xml.permission.AllowUnthrottledLocation> getAllowUnthrottledLocation();

    method public java.util.List<com.android.xml.permission.AppLink> getAppLink();

    method public java.util.List<com.android.xml.permission.AssignPermission> getAssignPermission();

    method public java.util.List<com.android.xml.permission.BackupTransportWhitelistedService> getBackupTransportWhitelistedService();

    method public java.util.List<com.android.xml.permission.BugreportWhitelisted> getBugreportWhitelisted();

    method public java.util.List<com.android.xml.permission.DefaultEnabledVrApp> getDefaultEnabledVrApp();

    method public java.util.List<com.android.xml.permission.DisabledUntilUsedPreinstalledCarrierApp> getDisabledUntilUsedPreinstalledCarrierApp();

    method public java.util.List<com.android.xml.permission.DisabledUntilUsedPreinstalledCarrierAssociatedApp> getDisabledUntilUsedPreinstalledCarrierAssociatedApp();

    method public java.util.List<com.android.xml.permission.Feature> getFeature();

    method public java.util.List<com.android.xml.permission.Group> getGroup();

    method public java.util.List<com.android.xml.permission.HiddenApiWhitelistedApp> getHiddenApiWhitelistedApp();

    method public java.util.List<com.android.xml.permission.Library> getLibrary();

    method public java.util.List<com.android.xml.permission.OemPermissions> getOemPermissions();

    method public java.util.List<com.android.xml.permission.Permission> getPermission();

    method public java.util.List<com.android.xml.permission.PrivappPermissions> getPrivappPermissions();

    method public java.util.List<com.android.xml.permission.SplitPermission> getSplitPermission();

    method public java.util.List<com.android.xml.permission.SystemUserBlacklistedApp> getSystemUserBlacklistedApp();

    method public java.util.List<com.android.xml.permission.SystemUserWhitelistedApp> getSystemUserWhitelistedApp();

    method public java.util.List<com.android.xml.permission.UnavailableFeature> getUnavailableFeature();

    method public java.util.List<com.android.xml.permission.configfile.AllowAssociation> getAllowAssociation();

    method public java.util.List<com.android.xml.permission.configfile.AllowIgnoreLocationSettings> getAllowIgnoreLocationSettings();

    method public java.util.List<com.android.xml.permission.configfile.AllowImplicitBroadcast> getAllowImplicitBroadcast();

    method public java.util.List<com.android.xml.permission.configfile.AllowInDataUsageSave> getAllowInDataUsageSave();

    method public java.util.List<com.android.xml.permission.configfile.AllowInPowerSave> getAllowInPowerSave();

    method public java.util.List<com.android.xml.permission.configfile.AllowInPowerSaveExceptIdle> getAllowInPowerSaveExceptIdle();

    method public java.util.List<com.android.xml.permission.configfile.AllowUnthrottledLocation> getAllowUnthrottledLocation();

    method public java.util.List<com.android.xml.permission.configfile.AppLink> getAppLink();

    method public java.util.List<com.android.xml.permission.configfile.AssignPermission> getAssignPermission();

    method public java.util.List<com.android.xml.permission.configfile.BackupTransportWhitelistedService> getBackupTransportWhitelistedService();

    method public java.util.List<com.android.xml.permission.configfile.BugreportWhitelisted> getBugreportWhitelisted();

    method public java.util.List<com.android.xml.permission.configfile.DefaultEnabledVrApp> getDefaultEnabledVrApp();

    method public java.util.List<com.android.xml.permission.configfile.DisabledUntilUsedPreinstalledCarrierApp> getDisabledUntilUsedPreinstalledCarrierApp();

    method public java.util.List<com.android.xml.permission.configfile.DisabledUntilUsedPreinstalledCarrierAssociatedApp> getDisabledUntilUsedPreinstalledCarrierAssociatedApp();

    method public java.util.List<com.android.xml.permission.configfile.Feature> getFeature();

    method public java.util.List<com.android.xml.permission.configfile.Group> getGroup();

    method public java.util.List<com.android.xml.permission.configfile.HiddenApiWhitelistedApp> getHiddenApiWhitelistedApp();

    method public java.util.List<com.android.xml.permission.configfile.Library> getLibrary();

    method public java.util.List<com.android.xml.permission.configfile.OemPermissions> getOemPermissions();

    method public java.util.List<com.android.xml.permission.configfile.Permission> getPermission();

    method public java.util.List<com.android.xml.permission.configfile.PrivappPermissions> getPrivappPermissions();

    method public java.util.List<com.android.xml.permission.configfile.SplitPermission> getSplitPermission();

    method public java.util.List<com.android.xml.permission.configfile.SystemUserBlacklistedApp> getSystemUserBlacklistedApp();

    method public java.util.List<com.android.xml.permission.configfile.SystemUserWhitelistedApp> getSystemUserWhitelistedApp();

    method public java.util.List<com.android.xml.permission.configfile.UnavailableFeature> getUnavailableFeature();

  }



  public class PrivappPermissions {

    ctor public PrivappPermissions();

    method public java.util.List<com.android.xml.permission.PrivappPermissions.DenyPermission> getDenyPermission();

    method public java.util.List<com.android.xml.permission.PrivappPermissions.Permission> getPermission();

    method public java.util.List<com.android.xml.permission.configfile.PrivappPermissions.DenyPermission> getDenyPermission();

    method public java.util.List<com.android.xml.permission.configfile.PrivappPermissions.Permission> getPermission();

    method public String get_package();

    method public void set_package(String);

  }
@@ -200,7 +200,7 @@ package com.android.xml.permission { 


  public class SplitPermission {

    ctor public SplitPermission();

    method public java.util.List<com.android.xml.permission.SplitPermission.Library> getLibrary();

    method public java.util.List<com.android.xml.permission.configfile.SplitPermission.Library> getLibrary();

    method public String getName();

    method public int getTargetSdk();

    method public void setName(String);
@@ -233,7 +233,7 @@ package com.android.xml.permission { 


  public class XmlParser {

    ctor public XmlParser();

    method public static com.android.xml.permission.Permissions read(java.io.InputStream) throws javax.xml.datatype.DatatypeConfigurationException, java.io.IOException, org.xmlpull.v1.XmlPullParserException;

    method public static com.android.xml.permission.configfile.Permissions read(java.io.InputStream) throws javax.xml.datatype.DatatypeConfigurationException, java.io.IOException, org.xmlpull.v1.XmlPullParserException;

    method public static String readText(org.xmlpull.v1.XmlPullParser) throws java.io.IOException, org.xmlpull.v1.XmlPullParserException;

    method public static void skip(org.xmlpull.v1.XmlPullParser) throws java.io.IOException, org.xmlpull.v1.XmlPullParserException;

  }

services/core/xsd/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -2,5 +2,5 @@ xsd_config { 
    name: "default-permissions",

    srcs: ["default-permissions.xsd"],

    api_dir: "schema",

    package_name: "com.android.server.pm.permission",

    package_name: "com.android.server.pm.permission.configfile",

}

services/core/xsd/default-permissions.xsd

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ 
    </xs:element>

    <xs:complexType name="exception">

        <xs:sequence>

            <xs:element name="permission" type="permission"/>

            <xs:element name="permission" type="permission" maxOccurs="unbounded"/>

        </xs:sequence>

        <xs:attribute name="package" type="xs:string"/>

        <xs:attribute name="sha256-cert-digest" type="xs:string"/>

services/core/xsd/schema/current.txt

+4 −5
Original line number Diff line number Diff line 
// Signature format: 2.0

package com.android.server.pm.permission {

package com.android.server.pm.permission.configfile {



  public class Exception {

    ctor public Exception();

    method public String getBrand();

    method public com.android.server.pm.permission.Permission getPermission();

    method public java.util.List<com.android.server.pm.permission.configfile.Permission> getPermission();

    method public String getSha256CertDigest();

    method public String get_package();

    method public void setBrand(String);

    method public void setPermission(com.android.server.pm.permission.Permission);

    method public void setSha256CertDigest(String);

    method public void set_package(String);

  }



  public class Exceptions {

    ctor public Exceptions();

    method public java.util.List<com.android.server.pm.permission.Exception> getException();

    method public java.util.List<com.android.server.pm.permission.configfile.Exception> getException();

  }



  public class Permission {
@@ -28,7 +27,7 @@ package com.android.server.pm.permission { 


  public class XmlParser {

    ctor public XmlParser();

    method public static com.android.server.pm.permission.Exceptions read(java.io.InputStream) throws javax.xml.datatype.DatatypeConfigurationException, java.io.IOException, org.xmlpull.v1.XmlPullParserException;

    method public static com.android.server.pm.permission.configfile.Exceptions read(java.io.InputStream) throws javax.xml.datatype.DatatypeConfigurationException, java.io.IOException, org.xmlpull.v1.XmlPullParserException;

    method public static String readText(org.xmlpull.v1.XmlPullParser) throws java.io.IOException, org.xmlpull.v1.XmlPullParserException;

    method public static void skip(org.xmlpull.v1.XmlPullParser) throws java.io.IOException, org.xmlpull.v1.XmlPullParserException;

  }