From 993d9a5e08d41a842857a27a6f539dce436370a4 Mon Sep 17 00:00:00 2001 From: Katarina Stenstedt Date: Fri, 22 Jan 2016 13:31:58 -0800 Subject: [PATCH] doc change: "Work Policy Controller" to "device policy controller". Bug: 24062075 Change-Id: I74287445d2268d0cc3752f09b8e326d210d84444 Staged: https://x20web.corp.google.com/~katarina/Android%206.0%20Changes%20_%20Android%20Developers.html https://x20web.corp.google.com/~katarina/Android%206.0%20APIs%20_%20Android%20Developers.html --- docs/html/about/versions/marshmallow/android-6.0-changes.jd | 4 ++-- docs/html/about/versions/marshmallow/android-6.0.jd | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/html/about/versions/marshmallow/android-6.0-changes.jd b/docs/html/about/versions/marshmallow/android-6.0-changes.jd index bae47175be8a9..f998590f5f7e0 100644 --- a/docs/html/about/versions/marshmallow/android-6.0-changes.jd +++ b/docs/html/about/versions/marshmallow/android-6.0-changes.jd @@ -346,8 +346,8 @@ addNetwork()} method) are now removed if that work profile is deleted. Owners have the privilege of editing or removing any Wi-Fi 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 +
  • Download device policy controller via Google account addition: When a Google +account that requires management via a device policy controller (DPC) app is added to a device outside of a managed context, the add account flow now prompts the user to install the appropriate WPC. This behavior also applies to accounts added via Settings > Accounts and in the initial device setup wizard.
    • diff --git a/docs/html/about/versions/marshmallow/android-6.0.jd b/docs/html/about/versions/marshmallow/android-6.0.jd index 732932f76e6d3..779ecf48c044b 100644 --- a/docs/html/about/versions/marshmallow/android-6.0.jd +++ b/docs/html/about/versions/marshmallow/android-6.0.jd @@ -553,7 +553,7 @@ a Device Owner can now auto-accept a system update, for instance in the case of a kiosk device, or postpone the update and prevent it being taken by the user for up to 30 days. Furthermore, an administrator can set a daily time window in which an update must be taken, for example during the hours when a kiosk device is not in use. When -a system update is available, the system checks if the Work Policy Controller app has set a system +a system update is available, the system checks if the device policy controller app has set a system update policy, and behaves accordingly.