diff options
| author | Adam Connors <adamconnors@google.com> | 2014-05-07 15:25:19 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-07 15:25:19 +0000 |
| commit | 0c89304fe078b3af31764928ba442e067b224b50 (patch) | |
| tree | 12eb7f6f7311f31883bc793f07f182f787ff035c /api | |
| parent | 96c99627c60861bfb764a35eb4c3e938680fa998 (diff) | |
| parent | 010cfd458121034075c7439020ffef4eedbcc0fc (diff) | |
| download | frameworks_base-0c89304fe078b3af31764928ba442e067b224b50.zip frameworks_base-0c89304fe078b3af31764928ba442e067b224b50.tar.gz frameworks_base-0c89304fe078b3af31764928ba442e067b224b50.tar.bz2 | |
am e068ba87: Add enableSystemApp methods to DevicePolicyManager
* commit 'e068ba879ea9a712bf7ad6c91e55238f76f122d9':
Add enableSystemApp methods to DevicePolicyManager
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.txt | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/api/current.txt b/api/current.txt index 75a3a77..4504e53 100644 --- a/api/current.txt +++ b/api/current.txt @@ -5013,6 +5013,8 @@ package android.app.admin { method public void clearForwardingIntentFilters(android.content.ComponentName); method public void clearPackagePersistentPreferredActivities(android.content.ComponentName, java.lang.String); method public void clearUserRestriction(android.content.ComponentName, java.lang.String); + method public void enableSystemApp(android.content.ComponentName, java.lang.String); + method public int enableSystemApp(android.content.ComponentName, android.content.Intent); method public java.util.List<android.content.ComponentName> getActiveAdmins(); method public android.os.Bundle getApplicationRestrictions(android.content.ComponentName, java.lang.String); method public boolean getCameraDisabled(android.content.ComponentName); @@ -20506,9 +20508,17 @@ package android.os { method public void setUserRestriction(java.lang.String, boolean); method public void setUserRestrictions(android.os.Bundle); method public void setUserRestrictions(android.os.Bundle, android.os.UserHandle); + field public static final java.lang.String DISALLOW_ADD_USER = "no_add_user"; + field public static final java.lang.String DISALLOW_CONFIG_APPS = "no_config_apps"; field public static final java.lang.String DISALLOW_CONFIG_BLUETOOTH = "no_config_bluetooth"; + field public static final java.lang.String DISALLOW_CONFIG_CELL_BROADCASTS = "no_config_cell_broadcasts"; field public static final java.lang.String DISALLOW_CONFIG_CREDENTIALS = "no_config_credentials"; + field public static final java.lang.String DISALLOW_CONFIG_MOBILE_NETWORKS = "no_config_mobile_networks"; + field public static final java.lang.String DISALLOW_CONFIG_TETHERING = "no_config_tethering"; + field public static final java.lang.String DISALLOW_CONFIG_VPN = "no_config_vpn"; field public static final java.lang.String DISALLOW_CONFIG_WIFI = "no_config_wifi"; + field public static final java.lang.String DISALLOW_DEBUGGING_FEATURES = "no_debugging_features"; + field public static final java.lang.String DISALLOW_FACTORY_RESET = "no_factory_reset"; field public static final java.lang.String DISALLOW_INSTALL_APPS = "no_install_apps"; field public static final java.lang.String DISALLOW_INSTALL_UNKNOWN_SOURCES = "no_install_unknown_sources"; field public static final java.lang.String DISALLOW_MODIFY_ACCOUNTS = "no_modify_accounts"; @@ -20516,15 +20526,7 @@ package android.os { field public static final java.lang.String DISALLOW_SHARE_LOCATION = "no_share_location"; field public static final java.lang.String DISALLOW_UNINSTALL_APPS = "no_uninstall_apps"; field public static final java.lang.String DISALLOW_USB_FILE_TRANSFER = "no_usb_file_transfer"; - field public static final java.lang.String DISALLOW_DEBUGGING_FEATURES = "no_debugging_features"; - field public static final java.lang.String DISALLOW_CONFIG_VPN = "no_config_vpn"; - field public static final java.lang.String DISALLOW_CONFIG_TETHERING = "no_config_tethering"; - field public static final java.lang.String DISALLOW_FACTORY_RESET = "no_factory_reset"; - field public static final java.lang.String DISALLOW_ADD_USER = "no_add_user"; field public static final java.lang.String ENSURE_VERIFY_APPS = "ensure_verify_apps"; - field public static final java.lang.String DISALLOW_CONFIG_CELL_BROADCASTS = "no_config_cell_broadcasts"; - field public static final java.lang.String DISALLOW_CONFIG_MOBILE_NETWORKS = "no_config_mobile_networks"; - field public static final java.lang.String DISALLOW_CONFIG_APPS = "no_config_apps"; } public abstract class Vibrator { |