From bd42bf3942ca200efb8faaaf3907570c7105e73b Mon Sep 17 00:00:00 2001 From: Sundong Ahn Date: Wed, 27 Mar 2019 15:27:37 +0900 Subject: [PATCH 1/2] Add maxOccurs The maxOccurs is added to permission element, because the maximum number of thimes this element can occurs is unbounded Bug: 127435354 Test: m -j && make -j checkapi Change-Id: I979f8020634c14c2dcb0e785713da74ce19f0245 --- services/core/xsd/default-permissions.xsd | 2 +- services/core/xsd/schema/current.txt | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/services/core/xsd/default-permissions.xsd b/services/core/xsd/default-permissions.xsd index d800a26cdceb5..2e32be0009ba9 100644 --- a/services/core/xsd/default-permissions.xsd +++ b/services/core/xsd/default-permissions.xsd @@ -27,7 +27,7 @@ - + diff --git a/services/core/xsd/schema/current.txt b/services/core/xsd/schema/current.txt index 4e67e5c235a0b..b4f869d7b2745 100644 --- a/services/core/xsd/schema/current.txt +++ b/services/core/xsd/schema/current.txt @@ -4,11 +4,10 @@ package com.android.server.pm.permission { public class Exception { ctor public Exception(); method public String getBrand(); - method public com.android.server.pm.permission.Permission getPermission(); + method public java.util.List 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); } From ea07526597c5d1cce1342e975145204aabd92f19 Mon Sep 17 00:00:00 2001 From: Sundong Ahn Date: Tue, 26 Mar 2019 11:35:27 +0900 Subject: [PATCH 2/2] Change the package name The "configfile" is added to package name to distinguish classes defined in java code from classes auto-generated. Bug: 127435354 Test: make -j && make -j checkapi Change-Id: I8d6e5c80a3e6eb103ebf1fe7b55a2a13d1629a37 --- core/xsd/Android.bp | 2 +- core/xsd/schema/current.txt | 64 ++++++++++++++-------------- services/core/xsd/Android.bp | 2 +- services/core/xsd/schema/current.txt | 8 ++-- 4 files changed, 38 insertions(+), 38 deletions(-) diff --git a/core/xsd/Android.bp b/core/xsd/Android.bp index 81669eb290db7..738f33076ac99 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 82bb0feac0895..13867da7b0374 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 getDenyPermission(); - method public java.util.List getPermission(); + method public java.util.List getDenyPermission(); + method public java.util.List 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 getAllowAssociation(); - method public java.util.List getAllowIgnoreLocationSettings(); - method public java.util.List getAllowImplicitBroadcast(); - method public java.util.List getAllowInDataUsageSave(); - method public java.util.List getAllowInPowerSave(); - method public java.util.List getAllowInPowerSaveExceptIdle(); - method public java.util.List getAllowUnthrottledLocation(); - method public java.util.List getAppLink(); - method public java.util.List getAssignPermission(); - method public java.util.List getBackupTransportWhitelistedService(); - method public java.util.List getBugreportWhitelisted(); - method public java.util.List getDefaultEnabledVrApp(); - method public java.util.List getDisabledUntilUsedPreinstalledCarrierApp(); - method public java.util.List getDisabledUntilUsedPreinstalledCarrierAssociatedApp(); - method public java.util.List getFeature(); - method public java.util.List getGroup(); - method public java.util.List getHiddenApiWhitelistedApp(); - method public java.util.List getLibrary(); - method public java.util.List getOemPermissions(); - method public java.util.List getPermission(); - method public java.util.List getPrivappPermissions(); - method public java.util.List getSplitPermission(); - method public java.util.List getSystemUserBlacklistedApp(); - method public java.util.List getSystemUserWhitelistedApp(); - method public java.util.List getUnavailableFeature(); + method public java.util.List getAllowAssociation(); + method public java.util.List getAllowIgnoreLocationSettings(); + method public java.util.List getAllowImplicitBroadcast(); + method public java.util.List getAllowInDataUsageSave(); + method public java.util.List getAllowInPowerSave(); + method public java.util.List getAllowInPowerSaveExceptIdle(); + method public java.util.List getAllowUnthrottledLocation(); + method public java.util.List getAppLink(); + method public java.util.List getAssignPermission(); + method public java.util.List getBackupTransportWhitelistedService(); + method public java.util.List getBugreportWhitelisted(); + method public java.util.List getDefaultEnabledVrApp(); + method public java.util.List getDisabledUntilUsedPreinstalledCarrierApp(); + method public java.util.List getDisabledUntilUsedPreinstalledCarrierAssociatedApp(); + method public java.util.List getFeature(); + method public java.util.List getGroup(); + method public java.util.List getHiddenApiWhitelistedApp(); + method public java.util.List getLibrary(); + method public java.util.List getOemPermissions(); + method public java.util.List getPermission(); + method public java.util.List getPrivappPermissions(); + method public java.util.List getSplitPermission(); + method public java.util.List getSystemUserBlacklistedApp(); + method public java.util.List getSystemUserWhitelistedApp(); + method public java.util.List getUnavailableFeature(); } public class PrivappPermissions { ctor public PrivappPermissions(); - method public java.util.List getDenyPermission(); - method public java.util.List getPermission(); + method public java.util.List getDenyPermission(); + method public java.util.List 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 getLibrary(); + method public java.util.List 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 5e1ea897b86e4..98e4343e6e573 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 b4f869d7b2745..a2092e3a99dca 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 getPermission(); + method public java.util.List 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 getException(); + method public java.util.List 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; }