diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-09-01 15:37:50 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-09-01 15:37:50 +0000 |
| commit | 182cd692ff014fac3f3dfd7cfe471ce2bedd52a2 (patch) | |
| tree | 6ac43b893232bf9b025cdcffaef17acf684c75f1 /core/java/android/app | |
| parent | e14fbaad442c700763e696e7987fb082ba0bddd2 (diff) | |
| parent | 47dd8f97ad240d10b20a8c631526b45bbe628a23 (diff) | |
Merge "Update Common Criteria mode javadoc"
Diffstat (limited to 'core/java/android/app')
| -rw-r--r-- | core/java/android/app/admin/DevicePolicyManager.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java index 98de85d9735d..7b3d9f113bda 100644 --- a/core/java/android/app/admin/DevicePolicyManager.java +++ b/core/java/android/app/admin/DevicePolicyManager.java @@ -11992,6 +11992,9 @@ public class DevicePolicyManager { * </ul> * Common Criteria mode is disabled by default. * + * <p><em>Note:</em> if Common Critera mode is turned off after being enabled previously, + * all existing WiFi configurations will be lost. + * * @param admin which {@link DeviceAdminReceiver} this request is associated with. * @param enabled whether Common Criteria mode should be enabled or not. */ |