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

Commit 6a6e20a4 authored by Tony Mak's avatar Tony Mak Committed by android-build-merger
Browse files

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

am: bf8137a7

Change-Id: I219b1d9246f4845e0d0100fd1490b3e2155caf32
parents 88aa87a1 bf8137a7

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -2865,7 +2865,7 @@ public class DevicePolicyManager { 
     * false if the profile has empty password as a separate challenge.

     * false if the profile has empty password as a separate challenge.

     *

     *

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

     * @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

     * @see UserManager#DISALLOW_UNIFIED_PASSWORD

     */

     */

    public boolean isUsingUnifiedPassword(@NonNull ComponentName admin) {

    public boolean isUsingUnifiedPassword(@NonNull ComponentName admin) {