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

Commit 88d601bb authored by Charles He's avatar Charles He Committed by Android (Google) Code Review
Browse files

Merge "Update API whitelist supported by parent profile"

parents 5d36bb6c 8c76056c

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

+2 −0
Original line number Diff line number Diff line
@@ -1056,6 +1056,7 @@ public class DevicePolicyManager { 
     *         otherwise

     */

    public boolean isAdminActive(@NonNull ComponentName admin) {

        throwIfParentInstance("isAdminActive");

        return isAdminActiveAsUser(admin, myUserId());

    }
@@ -6145,6 +6146,7 @@ public class DevicePolicyManager { 
     * <li>{@link #getPasswordExpirationTimeout}</li>

     * <li>{@link #setPasswordExpirationTimeout}</li>

     * <li>{@link #getPasswordExpiration}</li>

     * <li>{@link #getPasswordMaximumLength}</li>

     * <li>{@link #isActivePasswordSufficient}</li>

     * <li>{@link #getCurrentFailedPasswordAttempts}</li>

     * <li>{@link #getMaximumFailedPasswordsForWipe}</li>