diff options
| author | 2018-08-29 16:33:36 -0700 | |
|---|---|---|
| committer | 2018-08-29 16:33:36 -0700 | |
| commit | 1a96e5c5d3ea0293a146497ffb593effba513659 (patch) | |
| tree | 6ee35ae073917257d953afa9398785be97654986 | |
| parent | df80c8d7cc41bcca15de65b229185d2f9e84829b (diff) | |
| parent | 53141c3984930030bbe4b9ebab52bd7c71702bd3 (diff) | |
Merge "docs: Added reminder that custom CAs aren't automatically trusted by apps." into pi-dev
am: 53141c3984
Change-Id: I34c30f2a7e02590d551a0f327ab55cb56a550c4c
| -rw-r--r-- | core/java/android/app/admin/DevicePolicyManager.java | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java index 7bcc209c6500..eb8d8d37ae29 100644 --- a/core/java/android/app/admin/DevicePolicyManager.java +++ b/core/java/android/app/admin/DevicePolicyManager.java @@ -3889,6 +3889,11 @@ public class DevicePolicyManager { /** * 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 |