diff options
| author | 2019-09-23 16:08:03 -0700 | |
|---|---|---|
| committer | 2019-09-23 16:08:03 -0700 | |
| commit | 096ece8f5393c54350e058932953fd1e99ca8930 (patch) | |
| tree | 582dcb310b01e50fd91ba8857a434933624bde5e | |
| parent | 71f8040c3bbd4bd979a877f7d9bb5b6ca2adb09a (diff) | |
| parent | 2a082b1e9ef9b0fe81608743874bd0388f6ee752 (diff) | |
Merge "docs: List BIOMETRIC_WEAK in setPasswordQuality()" into qt-dev
am: 2a082b1e9e
Change-Id: I74d42b68ebed97c2db3a179e92ba3196ffc7a04f
| -rw-r--r-- | core/java/android/app/admin/DevicePolicyManager.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java index 441ff6ba4643..a17b2ddd7215 100644 --- a/core/java/android/app/admin/DevicePolicyManager.java +++ b/core/java/android/app/admin/DevicePolicyManager.java @@ -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}. |