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

Commit 8c76056c authored by Charles He's avatar Charles He
Browse files

Update API whitelist supported by parent profile 

1) Add #getPasswordMaximumLength() to the whitelist supported by the
parent profile
2) Throw SecurityException when #isAdminActive() is called on parent
profile

Change-Id: Idcc3ef48ce83963fcaa0259ec5f5781d95c83afa
Fixes: 32063080
Test: cts-tradefed run cts --module DevicePolicyManager --test com.android.cts.devicepolicy.ManagedProfileTest#testParentProfileApiDisabled
parent 81769558

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

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

     */

    public boolean isAdminActive(@NonNull ComponentName admin) {

        throwIfParentInstance("isAdminActive");

        return isAdminActiveAsUser(admin, myUserId());

    }
@@ -6140,6 +6141,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>