Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6ad79259 authored by Zoltan Szatmary-Ban's avatar Zoltan Szatmary-Ban Committed by Android Git Automerger
Browse files

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

* commit '745873f4':
  Update javadoc on DPM.setGlobalSetting
parents 2ec1f9d5 745873f4

core/java/android/app/admin/DevicePolicyManager.java

+2 −0
Original line number Diff line number Diff line
@@ -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}: