diff options
| author | Emily Bernier <ember@google.com> | 2013-04-12 20:21:35 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-04-12 20:21:36 +0000 |
| commit | ce70311b67c3dba6ed4fbda41617f4e24c82dfc7 (patch) | |
| tree | 3c574c1d31d3038077bc57973226438679651a95 /api | |
| parent | e527d256dcf1df96da4cb8a2c144a02748bbf96d (diff) | |
| parent | b223f73a69f76f5e32a0bca267f945f464776f9d (diff) | |
| download | frameworks_base-ce70311b67c3dba6ed4fbda41617f4e24c82dfc7.zip frameworks_base-ce70311b67c3dba6ed4fbda41617f4e24c82dfc7.tar.gz frameworks_base-ce70311b67c3dba6ed4fbda41617f4e24c82dfc7.tar.bz2 | |
Merge "Add user restrictions (credentials, user removal)" into jb-mr2-dev
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.txt | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt index ef6160f..3f04078 100644 --- a/api/current.txt +++ b/api/current.txt @@ -17089,6 +17089,9 @@ 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_CONFIG_CREDENTIALS = "no_config_credentials"; + field public static final java.lang.String DISALLOW_REMOVE_USER = "no_remove_user"; + } public abstract class Vibrator { |