summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--core/xsd/Android.bp2
-rw-r--r--core/xsd/schema/current.txt64
-rw-r--r--services/core/xsd/Android.bp2
-rw-r--r--services/core/xsd/schema/current.txt8
4 files changed, 38 insertions, 38 deletions
diff --git a/core/xsd/Android.bp b/core/xsd/Android.bp
index 81669eb290db..738f33076ac9 100644
--- a/core/xsd/Android.bp
+++ b/core/xsd/Android.bp
@@ -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",
}
diff --git a/core/xsd/schema/current.txt b/core/xsd/schema/current.txt
index 82bb0feac089..13867da7b037 100644
--- a/core/xsd/schema/current.txt
+++ b/core/xsd/schema/current.txt
@@ -1,5 +1,5 @@
// 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;
}
diff --git a/services/core/xsd/Android.bp b/services/core/xsd/Android.bp
index 5e1ea897b86e..98e4343e6e57 100644
--- a/services/core/xsd/Android.bp
+++ b/services/core/xsd/Android.bp
@@ -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",
}
diff --git a/services/core/xsd/schema/current.txt b/services/core/xsd/schema/current.txt
index b4f869d7b274..a2092e3a99dc 100644
--- a/services/core/xsd/schema/current.txt
+++ b/services/core/xsd/schema/current.txt
@@ -1,10 +1,10 @@
// 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 java.util.List<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);
@@ -14,7 +14,7 @@ package com.android.server.pm.permission {
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 {
@@ -27,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;
}