diff options
| author | Zoltan Szatmary-Ban <szatmz@google.com> | 2015-07-07 10:17:03 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-07-07 10:17:07 +0000 |
| commit | 41df5bfc0d50d36cb2c46d539043813bebbb1289 (patch) | |
| tree | 08f5b92ea58757c10e73723903ba6d71397c54fa | |
| parent | fad2e49c425e2cae88c297cb6cf2ac42e5f6fdd8 (diff) | |
| parent | 3c43095757a673166359553af5dc03159177ebd3 (diff) | |
| download | frameworks_base-41df5bfc0d50d36cb2c46d539043813bebbb1289.zip frameworks_base-41df5bfc0d50d36cb2c46d539043813bebbb1289.tar.gz frameworks_base-41df5bfc0d50d36cb2c46d539043813bebbb1289.tar.bz2 | |
Merge "Update javadoc on DPM.setGlobalSetting" into mnc-dev
| -rw-r--r-- | core/java/android/app/admin/DevicePolicyManager.java | 2 |
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}: |