aboutsummaryrefslogtreecommitdiff
path: root/en/devices
diff options
context:
space:
mode:
Diffstat (limited to 'en/devices')
-rw-r--r--en/devices/storage/adoptable.html3
-rw-r--r--en/devices/tech/admin/implement.html26
2 files changed, 26 insertions, 3 deletions
diff --git a/en/devices/storage/adoptable.html b/en/devices/storage/adoptable.html
index 85e8b100..c8233fd1 100644
--- a/en/devices/storage/adoptable.html
+++ b/en/devices/storage/adoptable.html
@@ -140,8 +140,7 @@ which SD card firmware may choose to use for optimization purposes.</p>
<p>In Android 8.x and lower, adoptable storage didn't work with FBE. All
existing devices that have adoptable storage used
<a href="/security/encryption/full-disk">full-disk encryption</a> (FDE).
-In Android 9, adoptable storage works with FBE and is encrypted using
-<a href="/security/encryption/metadata">metadata encryption</a>. However, by
+In Android 9, adoptable storage works with FBE. However, by
default, file contents are double-encrypted because adoptable storage has an
FDE and FBE layer. By default, both layers encrypt file contents, which can
slow device performance. To fix the problem of double encryption and speed up
diff --git a/en/devices/tech/admin/implement.html b/en/devices/tech/admin/implement.html
index f930e906..7e89d54f 100644
--- a/en/devices/tech/admin/implement.html
+++ b/en/devices/tech/admin/implement.html
@@ -103,12 +103,30 @@ managed profile or device has all required applications by modifying:</p>
<pre class="devsite-click-to-copy">
vendor_required_apps_managed_profile.xml
vendor_required_apps_managed_device.xml
+vendor_disallowed_apps_managed_profile.xml
+vendor_disallowed_apps_managed_device.xml
+/*
+ * The following are for Android 9 and higher only
+ */
+vendor_required_apps_managed_user.xml
+vendor_disallowed_apps_managed_user.xml
</pre>
+<p>
+Required and disallowed apps for managed users are applied to secondary users
+created via <code>DevicePolicyManager#createAndManageUser</code>.
+</p>
+
<p>Examples from a Nexus device:</p>
+<p>Android 8.x and earlier</p>
+<pre class="devsite-click-to-copy">
+pacakages/apps/ManagedProvisioning/res/values/vendor_required_apps_managed_device.xml
+</pre>
+
+<p>Android 9 and higher</p>
<pre class="devsite-click-to-copy">
-packages/apps/ManagedProvisioning/res/values/vendor_required_apps_managed_device.xml
+frameworks/base/core/res/res/values/vendor_required_apps_managed_device.xml
</pre>
<pre class="devsite-click-to-copy">
@@ -125,10 +143,16 @@ packages/apps/ManagedProvisioning/res/values/vendor_required_apps_managed_device
&lt;/resources&gt;
</pre>
+<p>Android 8.x and earlier</p>
<pre class="devsite-click-to-copy">
packages/apps/ManagedProvisioning/res/values/vendor_required_apps_managed_profile.xml
</pre>
+<p>Android 9 and higher</p>
+<pre class="devsite-click-to-copy">
+frameworks/base/core/res/res/values/vendor_required_apps_managed_profile.xml
+</pre>
+
<pre class="devsite-click-to-copy">
&lt;resources&gt;
&lt;!-- A list of apps to be retained in the managed profile. This includes any Google experience apps required. --&gt;