Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 41df5bfc: Merge "Update javadoc on DPM.setGlobalSetting" into mnc-dev

Browse Source 
* commit '41df5bfc0d50d36cb2c46d539043813bebbb1289':
  Update javadoc on DPM.setGlobalSetting
This commit is contained in:
Zoltan Szatmary-Ban
2015-07-07 15:49:49 +00:00
committed by Android Git Automerger
parent 2bb6828839 41df5bfc0d
commit bf3079917a
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/app/admin/DevicePolicyManager.java
View File

@@ -3975,6 +3975,8 @@ public class DevicePolicyManager {
* This setting is only available from {@link android.os.Build.VERSION_CODES#MNC} onwards * 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> * 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> * <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> * </ul>
* <p>Changing the following settings has no effect as of * <p>Changing the following settings has no effect as of
* {@link android.os.Build.VERSION_CODES#MNC}: * {@link android.os.Build.VERSION_CODES#MNC}: