Merge "Revert accidental change of isUsingUnifiedPassword javadoc" into pi-dev

am: bf8137a7cd

Change-Id: I219b1d9246f4845e0d0100fd1490b3e2155caf32
This commit is contained in:
Tony Mak
2018-03-06 15:46:32 +00:00
committed by android-build-merger

View File

@@ -2865,7 +2865,7 @@ public class DevicePolicyManager {
* false if the profile has empty password as a separate challenge.
*
* @param admin Which {@link DeviceAdminReceiver} this request is associated with.
* @throws SecurityException if {@code admin} is not a profile owner.
* @throws SecurityException if {@code admin} is not a profile owner of a managed profile.
* @see UserManager#DISALLOW_UNIFIED_PASSWORD
*/
public boolean isUsingUnifiedPassword(@NonNull ComponentName admin) {