diff --git a/docs/html/preview/behavior-changes.jd b/docs/html/preview/behavior-changes.jd
index 6ee0af0d09c1e..5c8ef413fc8d3 100644
--- a/docs/html/preview/behavior-changes.jd
+++ b/docs/html/preview/behavior-changes.jd
@@ -373,7 +373,7 @@ consideration that the interaction must be explicitly enabled.
Android for Work Changes
This preview includes the following behavior changes for Android for Work:
-- Work contacts in personal contexts. The Google Dialer
+
- Work contacts in personal contexts. The Google Dialer
Call Log now displays work contacts when the user views past calls.
Setting
{@link android.app.admin.DevicePolicyManager#setCrossProfileCallerIdDisabled(android.content.ComponentName, boolean) setCrossProfileCallerIdDisabled()}
@@ -381,21 +381,19 @@ to {@code true} hides the work profile contacts in the Google Dialer Call Log. W
displayed along with personal contacts to devices over Bluetooth only if
you set {@code DevicePolicyManager.setBluetoothContactSharingDisabled()} to {@code false}. By
default, it is set to {@code true}.
-
-- WiFi configuration removal: WiFi configurations added by a Profile Owner
+
+ - WiFi configuration removal: WiFi configurations added by a Profile Owner
(for example, through calls to the
{@link android.net.wifi.WifiManager#addNetwork(android.net.wifi.WifiConfiguration)
-addNetwork()} method) are now removed if that work profile is deleted.
-
-- WiFi configuration lockdown: Any WiFi configuration created by
+addNetwork()} method) are now removed if that work profile is deleted.
+
+ - WiFi configuration lockdown: Any WiFi configuration created by
an active Device Owner can no longer be modified or deleted by the user if
Settings.Global.WIFI_DEVICE_OWNER_CONFIGS_LOCKDOWN is non-zero.
The user can still create and modify their own WiFi configurations. Active Device
Owners have the privilege of editing/removing any WiFi configurations, including
those not created by them.
-
-
-
+
- Download Work Policy Controller via Google account addition: When a Google
account that requires management via a Work Policy Controller (WPC) app is added to a device
outside of a managed context, the add account flow now prompts the user to install the
@@ -408,7 +406,7 @@ method affects the camera for the calling user only; calling it from the managed
affect camera apps running on the primary user.
- In addition, the
{@link android.app.admin.DevicePolicyManager#setKeyguardDisabledFeatures(android.content.ComponentName,int) setKeyguardDisabledFeatures()}
- method is now available for Profile Owners, in addition to Device Owners.
+ method is now available for Profile Owners, as well as to Device Owners.
- A Profile Owner can set these keyguard restrictions:
- {@link android.app.admin.DevicePolicyManager#KEYGUARD_DISABLE_TRUST_AGENTS} and
@@ -422,9 +420,19 @@ affect camera apps running on the primary user.
- The {@link android.app.admin.DevicePolicyManager#setScreenCaptureDisabled(android.content.ComponentName, boolean) setScreenCaptureDisabled()} method now also blocks the assist structure when an app of the given user is in the foreground.
EXTRA_PROVISIONING_DEVICE_ADMIN_PACKAGE_CHECKSUM now defaults to SHA-256. SHA-1 is still supported for backwards compatibility but will be removed in future. EXTRA_PROVISIONING_DEVICE_ADMIN_SIGNATURE_CHECKSUM now only accepts SHA-256.
- Device initializer APIs which existed in the MNC preview are now removed. They will not appear in the final M release.
- - Android for Work APIs are optimized for M runtime permissions, including Work profiles, assist layer, and others. New DevicePolicyManager permission APIs don't affect pre-M apps.
-
- - Changes to global settings — the settings below can no longer be set via {@link android.app.admin.DevicePolicyManager#setGlobalSetting(android.content.ComponentName, java.lang.String, java.lang.String) setGlobalSettings()}:
+
EXTRA_PROVISIONING_RESET_PROTECTION_PARAMETERS is removed so NFC bump provisioning cannot programmatically unlock a factory reset protected device.
+ - Android for Work APIs are optimized for M runtime permissions, including Work profiles, assist layer, and others. New
DevicePolicyManager permission APIs don't affect pre-M apps.
+
+
+Changes to other APIs:
+
+ - Data Usage: The {@code android.app.usage.NetworkUsageStats} class has been renamed {@code android.app.usage.NetworkStats}.
+
+
+
+ Changes to global settings:
+
+ - These settings can no longer be set via {@link android.app.admin.DevicePolicyManager#setGlobalSetting(android.content.ComponentName, java.lang.String, java.lang.String) setGlobalSettings()}:
BLUETOOTH_ON
DEVELOPMENT_SETTINGS_ENABLED
@@ -433,4 +441,10 @@ affect camera apps running on the primary user.
WIFI_ON
+ These global settings can now be set via setGlobalSettings():
+
+ WIFI_DEVICE_OWNER_CONFIGS_LOCKDOWN
+
+
+