Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

DPMS: expose password blacklist API for SDK

Browse Source 
Test: cts-tradefed run cts -m CtsDevicePolicyManagerTestCases -t com.android.cts.devicepolicy.MixedManagedProfileOwnerTest#testPasswordBlacklist
Test: cts-tradefed run cts -m CtsAdminTestCases -t android.admin.cts.DevicePolicyManagerTest

Bug: 63578054
Change-Id: Ide58673ab22dcb4454a67300e8aa23b5fe343e3d
This commit is contained in:
Andrew Scull
2017-12-20 13:47:58 +00:00
parent df392c9a1d
commit 9dcb7cade9
2 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/current.txt
View File

@@ -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<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);

6
core/java/android/app/admin/DevicePolicyManager.java
View File

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