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

Commit f57d9dcb authored by Paul Crowley's avatar Paul Crowley Committed by Android Git Automerger
Browse files

am fbeeac82: Merge "Add a tag to separate paragraphs in Javadoc" into lmp-mr1-dev 

* commit 'fbeeac82':
  Add a tag to separate paragraphs in Javadoc
parents 3590a45e fbeeac82

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

+2 −2
Original line number Original line Diff line number Diff line
@@ -1481,8 +1481,8 @@ public class DevicePolicyManager { 
     * Flag for {@link #wipeData(int)}: also erase the factory reset protection

     * Flag for {@link #wipeData(int)}: also erase the factory reset protection

     * data.

     * data.

     *

     *

     * This flag may only be set by device owner admins; if it is set by other

     * <p>This flag may only be set by device owner admins; if it is set by

     * admins a {@link SecurityException} will be thrown.

     * other admins a {@link SecurityException} will be thrown.

     */

     */

    public static final int WIPE_RESET_PROTECTION_DATA = 0x0002;

    public static final int WIPE_RESET_PROTECTION_DATA = 0x0002;