Merge "Update API whitelist supported by parent profile"

2016-11-01 17:58:03 +00:00
parent 5d36bb6cc6 8c76056c19
commit 88d601bbaf
1 changed files with 2 additions and 0 deletions
--- a/core/java/android/app/admin/DevicePolicyManager.java
+++ b/core/java/android/app/admin/DevicePolicyManager.java
@@ -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>