Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "doc change: "Work Policy Controller" to "device policy controller"." into mnc-docs

Browse Source 
am: 7f895a9c48

* commit '7f895a9c48433655f6839364278d2044376b4808':
  doc change: "Work Policy Controller" to "device policy controller".
This commit is contained in:
Katarina Stenstedt
2016-01-27 00:15:46 +00:00
committed by android-build-merger
parent 5bb9748ae1 7f895a9c48
commit 8558ba8555
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
docs/html/about/versions/marshmallow/android-6.0-changes.jd
View File

@@ -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.
</li>
<li><strong>Download Work Policy Controller via Google account addition:</strong> When a Google
account that requires management via a Work Policy Controller (WPC) app is added to a device
<li><strong>Download device policy controller via Google account addition:</strong> 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
<strong>Settings > Accounts</strong> and in the initial device setup wizard.</li>

2
docs/html/about/versions/marshmallow/android-6.0.jd
View File

@@ -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.
</li>
<li>