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

Commit 96732680 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Rename AutoTime and AutoTimeZone APIs part 2 am: f9fe6f87 am: b6af479a am: 1be55405 

Change-Id: I9ca40f0db1e319ecce9b5b2c283882c85fcfda24
parents cedf1339 1be55405

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

+4 −3
Original line number Diff line number Diff line
@@ -8804,10 +8804,11 @@ public class DevicePolicyManager { 
     * <p>

     * The following settings used to be supported, but can be controlled in other ways:

     * <ul>

     * <li>{@link android.provider.Settings.Global#AUTO_TIME} : Use {@link #setAutoTime} and

     * <li>{@link android.provider.Settings.Global#AUTO_TIME} : Use {@link #setAutoTimeEnabled} and

     * {@link UserManager#DISALLOW_CONFIG_DATE_TIME} instead.</li>

     * <li>{@link android.provider.Settings.Global#AUTO_TIME_ZONE} : Use {@link #setAutoTimeZone}

     * and {@link UserManager#DISALLOW_CONFIG_DATE_TIME} instead.</li>

     * <li>{@link android.provider.Settings.Global#AUTO_TIME_ZONE} : Use

     * {@link #setAutoTimeZoneEnabled} and {@link UserManager#DISALLOW_CONFIG_DATE_TIME}

     * instead.</li>

     * <li>{@link android.provider.Settings.Global#DATA_ROAMING} : Use

     * {@link UserManager#DISALLOW_DATA_ROAMING} instead.</li>

     * </ul>