diff options
| author | Quddus Chong <quddusc@google.com> | 2015-08-17 15:55:02 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-08-17 15:55:02 +0000 |
| commit | ed7961eb5a1fceabf30a8f790c8dc37ae714db51 (patch) | |
| tree | 7260f5ce17dff779b02ba3a3d8139815e9fb2322 /docs | |
| parent | 9b3c0bc91aa5a40fd53e282a70f606c3af510f93 (diff) | |
| parent | 772a4884bd603e7580aa2fbab86a1cfec166673a (diff) | |
| download | frameworks_base-ed7961eb5a1fceabf30a8f790c8dc37ae714db51.zip frameworks_base-ed7961eb5a1fceabf30a8f790c8dc37ae714db51.tar.gz frameworks_base-ed7961eb5a1fceabf30a8f790c8dc37ae714db51.tar.bz2 | |
Merge "docs: Fixed typo in Android for Work section in MNC Behavior Changes doc." into mnc-dev
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/html/preview/behavior-changes.jd | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/html/preview/behavior-changes.jd b/docs/html/preview/behavior-changes.jd index bf4dc1a..cab4163 100644 --- a/docs/html/preview/behavior-changes.jd +++ b/docs/html/preview/behavior-changes.jd @@ -80,7 +80,7 @@ access and suspends syncs and jobs for the apps it deems idle.</li> </ul> <p>To learn more about these power-saving changes, see -<a href="{@docRoot}preview/power-mgmt.html">Power-Saving Optimizations</a>.</p> +<a href="{@docRoot}preview/features/power-mgmt.html">Power-Saving Optimizations</a>.</p> <h2 id="behavior-adoptable-storage">Adoptable Storage Devices</h2> <p> @@ -396,7 +396,7 @@ affect camera apps running on the primary user.</li> <li>The {@link android.app.admin.DevicePolicyManager#createAndInitializeUser(android.content.ComponentName, java.lang.String, java.lang.String, android.content.ComponentName, android.os.Bundle) createAndInitializeUser()} and {@link android.app.admin.DevicePolicyManager#createUser(android.content.ComponentName, java.lang.String) createUser()} methods have been deprecated.</li> <li>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. </li> - <li>{@link android.app.admin.DevicePolicyManager#EXTRA_PROVISIONING_DEVICE_ADMIN_SIGNATURE_CHECKSUM} + <li>{@link android.app.admin.DevicePolicyManager#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. {@link android.app.admin.DevicePolicyManager#EXTRA_PROVISIONING_DEVICE_ADMIN_SIGNATURE_CHECKSUM} |