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

Merge "Change to choice"

Browse Source 
am: 5baeab86a0

Change-Id: Idb8bf87d8980d15a30ea0a8d4f20f23649e07d34
This commit is contained in:
Sundong Ahn
2019-04-04 17:58:20 -07:00
committed by android-build-merger
parent be708ba226 5baeab86a0
commit a409e9fbb7
2 changed files with 52 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
core/xsd/permission.xsd
View File

@@ -20,33 +20,33 @@
xmlns:xs="http://www.w3.org/2001/XMLSchema"> xmlns:xs="http://www.w3.org/2001/XMLSchema">
<xs:element name="permissions"> <xs:element name="permissions">
<xs:complexType> <xs:complexType>
<xs:sequence> <xs:choice minOccurs="0" maxOccurs="unbounded">
<xs:element name="group" type="group" maxOccurs="unbounded"/> <xs:element name="group" type="group"/>
<xs:element name="permission" type="permission" maxOccurs="unbounded"/> <xs:element name="permission" type="permission"/>
<xs:element name="assign-permission" type="assign-permission" maxOccurs="unbounded"/> <xs:element name="assign-permission" type="assign-permission"/>
<xs:element name="split-permission" type="split-permission" maxOccurs="unbounded"/> <xs:element name="split-permission" type="split-permission"/>
<xs:element name="library" type="library" maxOccurs="unbounded"/> <xs:element name="library" type="library"/>
<xs:element name="feature" type="feature" maxOccurs="unbounded"/> <xs:element name="feature" type="feature"/>
<xs:element name="unavailable-feature" type="unavailable-feature" maxOccurs="unbounded"/> <xs:element name="unavailable-feature" type="unavailable-feature"/>
<xs:element name="allow-in-power-save-except-idle" type="allow-in-power-save-except-idle" maxOccurs="unbounded"/> <xs:element name="allow-in-power-save-except-idle" type="allow-in-power-save-except-idle"/>
<xs:element name="allow-in-power-save" type="allow-in-power-save" maxOccurs="unbounded"/> <xs:element name="allow-in-power-save" type="allow-in-power-save"/>
<xs:element name="allow-in-data-usage-save" type="allow-in-data-usage-save" maxOccurs="unbounded"/> <xs:element name="allow-in-data-usage-save" type="allow-in-data-usage-save"/>
<xs:element name="allow-unthrottled-location" type="allow-unthrottled-location" maxOccurs="unbounded"/> <xs:element name="allow-unthrottled-location" type="allow-unthrottled-location"/>
<xs:element name="allow-ignore-location-settings" type="allow-ignore-location-settings" maxOccurs="unbounded"/> <xs:element name="allow-ignore-location-settings" type="allow-ignore-location-settings"/>
<xs:element name="allow-implicit-broadcast" type="allow-implicit-broadcast" maxOccurs="unbounded"/> <xs:element name="allow-implicit-broadcast" type="allow-implicit-broadcast"/>
<xs:element name="app-link" type="app-link" maxOccurs="unbounded"/> <xs:element name="app-link" type="app-link"/>
<xs:element name="system-user-whitelisted-app" type="system-user-whitelisted-app" maxOccurs="unbounded"/> <xs:element name="system-user-whitelisted-app" type="system-user-whitelisted-app"/>
<xs:element name="system-user-blacklisted-app" type="system-user-blacklisted-app" maxOccurs="unbounded"/> <xs:element name="system-user-blacklisted-app" type="system-user-blacklisted-app"/>
<xs:element name="default-enabled-vr-app" type="default-enabled-vr-app" maxOccurs="unbounded"/> <xs:element name="default-enabled-vr-app" type="default-enabled-vr-app"/>
<xs:element name="backup-transport-whitelisted-service" type="backup-transport-whitelisted-service" maxOccurs="unbounded"/> <xs:element name="backup-transport-whitelisted-service" type="backup-transport-whitelisted-service"/>
<xs:element name="disabled-until-used-preinstalled-carrier-associated-app" type="disabled-until-used-preinstalled-carrier-associated-app" maxOccurs="unbounded"/> <xs:element name="disabled-until-used-preinstalled-carrier-associated-app" type="disabled-until-used-preinstalled-carrier-associated-app"/>
<xs:element name="disabled-until-used-preinstalled-carrier-app" type="disabled-until-used-preinstalled-carrier-app" maxOccurs="unbounded"/> <xs:element name="disabled-until-used-preinstalled-carrier-app" type="disabled-until-used-preinstalled-carrier-app"/>
<xs:element name="privapp-permissions" type="privapp-permissions" maxOccurs="unbounded"/> <xs:element name="privapp-permissions" type="privapp-permissions"/>
<xs:element name="oem-permissions" type="oem-permissions" maxOccurs="unbounded"/> <xs:element name="oem-permissions" type="oem-permissions"/>
<xs:element name="hidden-api-whitelisted-app" type="hidden-api-whitelisted-app" maxOccurs="unbounded"/> <xs:element name="hidden-api-whitelisted-app" type="hidden-api-whitelisted-app"/>
<xs:element name="allow-association" type="allow-association" maxOccurs="unbounded"/> <xs:element name="allow-association" type="allow-association"/>
<xs:element name="bugreport-whitelisted" type="bugreport-whitelisted" maxOccurs="unbounded"/> <xs:element name="bugreport-whitelisted" type="bugreport-whitelisted"/>
</xs:sequence> </xs:choice>
</xs:complexType> </xs:complexType>
</xs:element> </xs:element>
<xs:complexType name="group"> <xs:complexType name="group">

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

@@ -153,31 +153,31 @@ package com.android.xml.permission.configfile {
public class Permissions { public class Permissions {
ctor public Permissions(); ctor public Permissions();
method public java.util.List<com.android.xml.permission.configfile.AllowAssociation> getAllowAssociation(); method public java.util.List<com.android.xml.permission.configfile.AllowAssociation> getAllowAssociation_optional();
method public java.util.List<com.android.xml.permission.configfile.AllowIgnoreLocationSettings> getAllowIgnoreLocationSettings(); method public java.util.List<com.android.xml.permission.configfile.AllowIgnoreLocationSettings> getAllowIgnoreLocationSettings_optional();
method public java.util.List<com.android.xml.permission.configfile.AllowImplicitBroadcast> getAllowImplicitBroadcast(); method public java.util.List<com.android.xml.permission.configfile.AllowImplicitBroadcast> getAllowImplicitBroadcast_optional();
method public java.util.List<com.android.xml.permission.configfile.AllowInDataUsageSave> getAllowInDataUsageSave(); method public java.util.List<com.android.xml.permission.configfile.AllowInDataUsageSave> getAllowInDataUsageSave_optional();
method public java.util.List<com.android.xml.permission.configfile.AllowInPowerSave> getAllowInPowerSave(); method public java.util.List<com.android.xml.permission.configfile.AllowInPowerSaveExceptIdle> getAllowInPowerSaveExceptIdle_optional();
method public java.util.List<com.android.xml.permission.configfile.AllowInPowerSaveExceptIdle> getAllowInPowerSaveExceptIdle(); method public java.util.List<com.android.xml.permission.configfile.AllowInPowerSave> getAllowInPowerSave_optional();
method public java.util.List<com.android.xml.permission.configfile.AllowUnthrottledLocation> getAllowUnthrottledLocation(); method public java.util.List<com.android.xml.permission.configfile.AllowUnthrottledLocation> getAllowUnthrottledLocation_optional();
method public java.util.List<com.android.xml.permission.configfile.AppLink> getAppLink(); method public java.util.List<com.android.xml.permission.configfile.AppLink> getAppLink_optional();
method public java.util.List<com.android.xml.permission.configfile.AssignPermission> getAssignPermission(); method public java.util.List<com.android.xml.permission.configfile.AssignPermission> getAssignPermission_optional();
method public java.util.List<com.android.xml.permission.configfile.BackupTransportWhitelistedService> getBackupTransportWhitelistedService(); method public java.util.List<com.android.xml.permission.configfile.BackupTransportWhitelistedService> getBackupTransportWhitelistedService_optional();
method public java.util.List<com.android.xml.permission.configfile.BugreportWhitelisted> getBugreportWhitelisted(); method public java.util.List<com.android.xml.permission.configfile.BugreportWhitelisted> getBugreportWhitelisted_optional();
method public java.util.List<com.android.xml.permission.configfile.DefaultEnabledVrApp> getDefaultEnabledVrApp(); method public java.util.List<com.android.xml.permission.configfile.DefaultEnabledVrApp> getDefaultEnabledVrApp_optional();
method public java.util.List<com.android.xml.permission.configfile.DisabledUntilUsedPreinstalledCarrierApp> getDisabledUntilUsedPreinstalledCarrierApp(); method public java.util.List<com.android.xml.permission.configfile.DisabledUntilUsedPreinstalledCarrierApp> getDisabledUntilUsedPreinstalledCarrierApp_optional();
method public java.util.List<com.android.xml.permission.configfile.DisabledUntilUsedPreinstalledCarrierAssociatedApp> getDisabledUntilUsedPreinstalledCarrierAssociatedApp(); method public java.util.List<com.android.xml.permission.configfile.DisabledUntilUsedPreinstalledCarrierAssociatedApp> getDisabledUntilUsedPreinstalledCarrierAssociatedApp_optional();
method public java.util.List<com.android.xml.permission.configfile.Feature> getFeature(); method public java.util.List<com.android.xml.permission.configfile.Feature> getFeature_optional();
method public java.util.List<com.android.xml.permission.configfile.Group> getGroup(); method public java.util.List<com.android.xml.permission.configfile.Group> getGroup_optional();
method public java.util.List<com.android.xml.permission.configfile.HiddenApiWhitelistedApp> getHiddenApiWhitelistedApp(); method public java.util.List<com.android.xml.permission.configfile.HiddenApiWhitelistedApp> getHiddenApiWhitelistedApp_optional();
method public java.util.List<com.android.xml.permission.configfile.Library> getLibrary(); method public java.util.List<com.android.xml.permission.configfile.Library> getLibrary_optional();
method public java.util.List<com.android.xml.permission.configfile.OemPermissions> getOemPermissions(); method public java.util.List<com.android.xml.permission.configfile.OemPermissions> getOemPermissions_optional();
method public java.util.List<com.android.xml.permission.configfile.Permission> getPermission(); method public java.util.List<com.android.xml.permission.configfile.Permission> getPermission_optional();
method public java.util.List<com.android.xml.permission.configfile.PrivappPermissions> getPrivappPermissions(); method public java.util.List<com.android.xml.permission.configfile.PrivappPermissions> getPrivappPermissions_optional();
method public java.util.List<com.android.xml.permission.configfile.SplitPermission> getSplitPermission(); method public java.util.List<com.android.xml.permission.configfile.SplitPermission> getSplitPermission_optional();
method public java.util.List<com.android.xml.permission.configfile.SystemUserBlacklistedApp> getSystemUserBlacklistedApp(); method public java.util.List<com.android.xml.permission.configfile.SystemUserBlacklistedApp> getSystemUserBlacklistedApp_optional();
method public java.util.List<com.android.xml.permission.configfile.SystemUserWhitelistedApp> getSystemUserWhitelistedApp(); method public java.util.List<com.android.xml.permission.configfile.SystemUserWhitelistedApp> getSystemUserWhitelistedApp_optional();
method public java.util.List<com.android.xml.permission.configfile.UnavailableFeature> getUnavailableFeature(); method public java.util.List<com.android.xml.permission.configfile.UnavailableFeature> getUnavailableFeature_optional();
} }
public class PrivappPermissions { public class PrivappPermissions {