commit 53141c3984930030bbe4b9ebab52bd7c71702bd3
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Aug 29 23:22:01 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Aug 29 23:22:01 2018 +0000
tree 7a5e45ccd948f9106d8a30a7230963c91fc5918b
parent f5411070a836c726cae05318e31c941c5ec06ffc
parent 8a12c12ad2ff0c149a62511fc70fbddb1398c676

Merge "docs: Added reminder that custom CAs aren't automatically trusted by apps." into pi-dev

core/java/android/app/admin/DevicePolicyManager.java

diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java
index 22367b2..27e45a3 100644
--- a/core/java/android/app/admin/DevicePolicyManager.java
+++ b/core/java/android/app/admin/DevicePolicyManager.java
@@ -3870,6 +3870,11 @@
 
     /**
      * Installs the given certificate as a user CA.
+     * <p>
+     * Inserted user CAs aren't automatically trusted by apps in Android 7.0 (API level 24) and
+     * higher. App developers can change the default behavior for an app by adding a
+     * <a href="{@docRoot}training/articles/security-config.html">Security Configuration
+     * File</a> to the app manifest file.
      *
      * The caller must be a profile or device owner on that user, or a delegate package given the
      * {@link #DELEGATION_CERT_INSTALL} scope via {@link #setDelegatedScopes}; otherwise a