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

Commit 8b2af876 authored by Andrew Scull's avatar Andrew Scull Committed by Android (Google) Code Review
Browse files

Merge "DPMS: expose password blacklist API for SDK"

parents ad884719 9dcb7cad

api/current.txt

+2 −0
Original line number Diff line number Diff line
@@ -6368,6 +6368,7 @@ package android.app.admin { 
    method public int getOrganizationColor(android.content.ComponentName);

    method public java.lang.CharSequence getOrganizationName(android.content.ComponentName);

    method public android.app.admin.DevicePolicyManager getParentProfileInstance(android.content.ComponentName);

    method public java.lang.String getPasswordBlacklistName(android.content.ComponentName);

    method public long getPasswordExpiration(android.content.ComponentName);

    method public long getPasswordExpirationTimeout(android.content.ComponentName);

    method public int getPasswordHistoryLength(android.content.ComponentName);
@@ -6468,6 +6469,7 @@ package android.app.admin { 
    method public void setOrganizationColor(android.content.ComponentName, int);

    method public void setOrganizationName(android.content.ComponentName, java.lang.CharSequence);

    method public java.lang.String[] setPackagesSuspended(android.content.ComponentName, java.lang.String[], boolean);

    method public boolean setPasswordBlacklist(android.content.ComponentName, java.lang.String, java.util.List<java.lang.String>);

    method public void setPasswordExpirationTimeout(android.content.ComponentName, long);

    method public void setPasswordHistoryLength(android.content.ComponentName, int);

    method public void setPasswordMinimumLength(android.content.ComponentName, int);

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

+0 −6
Original line number Diff line number Diff line
@@ -2690,9 +2690,6 @@ public class DevicePolicyManager { 
     * @see #getPasswordBlacklistName

     * @see #isActivePasswordSufficient

     * @see #resetPasswordWithToken

     *

     * TODO(63578054): unhide for P

     * @hide

     */

    public boolean setPasswordBlacklist(@NonNull ComponentName admin, @Nullable String name,

            @Nullable List<String> blacklist) {
@@ -2712,9 +2709,6 @@ public class DevicePolicyManager { 
     * @return the name of the blacklist or {@code null} if no blacklist is set

     *

     * @see #setPasswordBlacklist

     *

     * TODO(63578054): unhide for P

     * @hide

     */

    public @Nullable String getPasswordBlacklistName(@NonNull ComponentName admin) {

        try {