commit 3c43095757a673166359553af5dc03159177ebd3
author Zoltan Szatmary-Ban <szatmz@google.com> Fri Jul 03 14:04:09 2015 +0100
committer Zoltan Szatmary-Ban <szatmz@google.com> Fri Jul 03 14:04:09 2015 +0100
tree ac9e5255ac1283cda190fc61650fa78cf3872c66
parent 00f0716a9521c668e0e42c36ee19a5f58e62f00f

Update javadoc on DPM.setGlobalSetting

Bug: 19967818
Change-Id: Id91c137f7b5200be8e8b581126a518f3b6be147e

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 d28ff51..f2c907a 100644
--- a/core/java/android/app/admin/DevicePolicyManager.java
+++ b/core/java/android/app/admin/DevicePolicyManager.java
@@ -3975,6 +3975,8 @@
      *   This setting is only available from {@link android.os.Build.VERSION_CODES#MNC} onwards
      *   and can only be set if {@link #setMaximumTimeToLock} is not used to set a timeout.</li>
      * <li>{@link Settings.Global#WIFI_DEVICE_OWNER_CONFIGS_LOCKDOWN}</li>
+     *   This setting is only available from {@link android.os.Build.VERSION_CODES#MNC} onwards.
+     *   </li>
      * </ul>
      * <p>Changing the following settings has no effect as of
      * {@link android.os.Build.VERSION_CODES#MNC}: