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

Commit a75d6681 authored by Kevin Hufnagle's avatar Kevin Hufnagle Committed by android-build-merger
Browse files

Merge "docs: List BIOMETRIC_WEAK in setPasswordQuality()" into qt-dev am: 2a082b1e 

am: 096ece8f

Change-Id: I9b64cde1a5ad874318feb3e4210f966e774f0f25
parents fd4c08b6 096ece8f

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

+3 −1
Original line number Diff line number Diff line
@@ -1551,7 +1551,8 @@ public class DevicePolicyManager { 
     * scopes will be sent in an {@code ArrayList<String>} extra identified by the

     * {@link #EXTRA_DELEGATION_SCOPES} key.

     *

     * <p class=”note”> Note: This is a protected intent that can only be sent by the system.</p>

     * <p class="note"><b>Note:</b> This is a protected intent that can only be sent by the

     * system.</p>

     */

    @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)

    public static final String ACTION_APPLICATION_DELEGATION_SCOPES_CHANGED =
@@ -2610,6 +2611,7 @@ public class DevicePolicyManager { 
     *

     * @param admin Which {@link DeviceAdminReceiver} this request is associated with.

     * @param quality The new desired quality. One of {@link #PASSWORD_QUALITY_UNSPECIFIED},

     *            {@link #PASSWORD_QUALITY_BIOMETRIC_WEAK},

     *            {@link #PASSWORD_QUALITY_SOMETHING}, {@link #PASSWORD_QUALITY_NUMERIC},

     *            {@link #PASSWORD_QUALITY_NUMERIC_COMPLEX}, {@link #PASSWORD_QUALITY_ALPHABETIC},

     *            {@link #PASSWORD_QUALITY_ALPHANUMERIC} or {@link #PASSWORD_QUALITY_COMPLEX}.