diff options
| author | Julia Reynolds <juliacr@google.com> | 2014-05-07 14:24:42 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-07 14:24:42 +0000 |
| commit | 49d1728855be91899873fbc144143ca8c2c07892 (patch) | |
| tree | 2c28aae1dd12dbb4e8cc344cc096a60c9bdb3c59 /api | |
| parent | ecef97e0188f9ade5e2a11197f044da2b75b3be1 (diff) | |
| parent | d46d0f9dcd72dfaa93a57d07d896def6ce53bbae (diff) | |
| download | frameworks_base-49d1728855be91899873fbc144143ca8c2c07892.zip frameworks_base-49d1728855be91899873fbc144143ca8c2c07892.tar.gz frameworks_base-49d1728855be91899873fbc144143ca8c2c07892.tar.bz2 | |
am 5d24ddf3: Add new EDU user restrictions.
* commit '5d24ddf35e25ad681cf8ec3228c4fa6aca523809':
Add new EDU user restrictions.
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.txt | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt index a2be44e..75a3a77 100644 --- a/api/current.txt +++ b/api/current.txt @@ -20516,6 +20516,15 @@ 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 { |