summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZoltan Szatmary-Ban <szatmz@google.com>2015-07-03 14:04:09 +0100
committerZoltan Szatmary-Ban <szatmz@google.com>2015-07-03 14:04:09 +0100
commit3c43095757a673166359553af5dc03159177ebd3 (patch)
treeac9e5255ac1283cda190fc61650fa78cf3872c66
parent00f0716a9521c668e0e42c36ee19a5f58e62f00f (diff)
downloadframeworks_base-3c43095757a673166359553af5dc03159177ebd3.zip
frameworks_base-3c43095757a673166359553af5dc03159177ebd3.tar.gz
frameworks_base-3c43095757a673166359553af5dc03159177ebd3.tar.bz2
Update javadoc on DPM.setGlobalSetting
Bug: 19967818 Change-Id: Id91c137f7b5200be8e8b581126a518f3b6be147e
-rw-r--r--core/java/android/app/admin/DevicePolicyManager.java2
1 files changed, 2 insertions, 0 deletions
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 @@ public class DevicePolicyManager {
* 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}: