summaryrefslogtreecommitdiffstats
path: root/api
diff options
context:
space:
mode:
authorEmily Bernier <ember@google.com>2014-05-07 12:49:20 -0400
committerEmily Bernier <ember@google.com>2014-05-07 17:04:58 -0400
commit394a6cdd987fed79bd040f39e2d3e47d4484bab4 (patch)
tree62903faa86db737abb2a2e1dff83f9e877e1f553 /api
parent4297409e458646db914d78f20aef71606622ca7e (diff)
downloadframeworks_base-394a6cdd987fed79bd040f39e2d3e47d4484bab4.zip
frameworks_base-394a6cdd987fed79bd040f39e2d3e47d4484bab4.tar.gz
frameworks_base-394a6cdd987fed79bd040f39e2d3e47d4484bab4.tar.bz2
New user restrictions for EDU
New user restrictions will allow schools to prevent students from 1) using device microphones, 2) adjusting device volume, and 3) mounting physical external media. Change-Id: Ib2fcb7ce8fbc489a25d2c97a122b2124012a9e3c
Diffstat (limited to 'api')
-rw-r--r--api/current.txt3
1 files changed, 3 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt
index d9add0b..957d70a 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -20518,6 +20518,7 @@ package android.os {
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_ADJUST_VOLUME = "no_adjust_volume";
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";
@@ -20531,9 +20532,11 @@ package android.os {
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";
+ field public static final java.lang.String DISALLOW_MOUNT_PHYSICAL_MEDIA = "no_physical_media";
field public static final java.lang.String DISALLOW_REMOVE_USER = "no_remove_user";
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_UNMUTE_MICROPHONE = "no_unmute_microphone";
field public static final java.lang.String DISALLOW_USB_FILE_TRANSFER = "no_usb_file_transfer";
field public static final java.lang.String ENSURE_VERIFY_APPS = "ensure_verify_apps";
}