diff --git a/api/current.txt b/api/current.txt index c8a85d4bf009e..81a611638c2ba 100644 --- a/api/current.txt +++ b/api/current.txt @@ -6365,6 +6365,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); @@ -6465,6 +6466,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); method public void setPasswordExpirationTimeout(android.content.ComponentName, long); method public void setPasswordHistoryLength(android.content.ComponentName, int); method public void setPasswordMinimumLength(android.content.ComponentName, int); diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java index 98162976173d8..a81826368ab9b 100644 --- a/core/java/android/app/admin/DevicePolicyManager.java +++ b/core/java/android/app/admin/DevicePolicyManager.java @@ -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 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 {