diff options
| author | Kevin Hufnagle <khufnagle@google.com> | 2019-09-23 16:33:57 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-09-23 16:33:57 -0700 |
| commit | 909128690a7ae5e7c4a37705e3117c027a4876a9 (patch) | |
| tree | 3e2b0f84e0c7fb2f6811bc77000f2cee250c74d7 /core/java | |
| parent | 679a4248a9c8a34e12809064136ee5f0efab090d (diff) | |
| parent | 07a467ed78596061360179e9925af8c78c3c773f (diff) | |
Merge "docs: List BIOMETRIC_WEAK in setPasswordQuality()" into qt-dev am: 2a082b1e9e am: 096ece8f53 am: 25309b11da
am: 07a467ed78
Change-Id: I4fe698dd4ee7e1c2c3a0993f9cbecda6de0463d1
Diffstat (limited to 'core/java')
| -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 02cac231f372..64ddfc106dcf 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 = @@ -2609,6 +2610,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}. |