Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Change the package name

Browse Source 
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
This commit is contained in:
Sundong Ahn
2019-03-26 11:35:27 +09:00
parent bd42bf3942
commit ea07526597
4 changed files with 38 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/xsd/Android.bp
View File

@@ -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",
}

64
core/xsd/schema/current.txt
View File

@@ -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;
}

2
services/core/xsd/Android.bp
View File

@@ -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",
}

8
services/core/xsd/schema/current.txt
View File

@@ -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;
}