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

Commit 51e41ad8 authored by Clara Bayarri's avatar Clara Bayarri
Browse files

Add support for current failed lock attempts and max attempts 

This is needed from Settings to show a message informing the user
of the number of attempts before their work profile gets wiped
when using ConfirmDeviceCredentials.

Bug: 26677759
Change-Id: I4b16f7dc2f415d0ce0215a3b7a646f98fabece33
parent e64f3da7

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

+15 −1
Original line number Diff line number Diff line
@@ -1826,9 +1826,23 @@ public class DevicePolicyManager { 
     * this method; if it has not, a security exception will be thrown.

     */

    public int getCurrentFailedPasswordAttempts() {

        return getCurrentFailedPasswordAttempts(myUserId());

    }



    /**

     * Retrieve the number of times the given user has failed at entering a

     * password since that last successful password entry.

     *

     * <p>The calling device admin must have requested

     * {@link DeviceAdminInfo#USES_POLICY_WATCH_LOGIN} to be able to call this method; if it has

     * not and it is not the system uid, a security exception will be thrown.

     *

     * @hide

     */

    public int getCurrentFailedPasswordAttempts(int userHandle) {

        if (mService != null) {

            try {

                return mService.getCurrentFailedPasswordAttempts(myUserId(), mParentInstance);

                return mService.getCurrentFailedPasswordAttempts(userHandle, mParentInstance);

            } catch (RemoteException e) {

                Log.w(TAG, REMOTE_EXCEPTION_MESSAGE, e);

            }

core/java/com/android/internal/widget/LockPatternUtils.java

+9 −0
Original line number Diff line number Diff line
@@ -283,6 +283,15 @@ public class LockPatternUtils { 
        getTrustManager().reportUnlockAttempt(true /* authenticated */, userId);

    }



    public int getCurrentFailedPasswordAttempts(int userId) {

        return getDevicePolicyManager().getCurrentFailedPasswordAttempts(userId);

    }



    public int getMaximumFailedPasswordsForWipe(int userId) {

        return getDevicePolicyManager().getMaximumFailedPasswordsForWipe(

                null /* componentName */, userId);

    }



    /**

     * Check to see if a pattern matches the saved pattern.

     * If pattern matches, return an opaque attestation that the challenge

services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java

+7 −4
Original line number Diff line number Diff line
@@ -3527,11 +3527,14 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { 


    @Override

    public int getCurrentFailedPasswordAttempts(int userHandle, boolean parent) {

        enforceFullCrossUsersPermission(userHandle);

        synchronized (this) {

            if (!isCallerWithSystemUid()) {

                // This API can only be called by an active device admin,

                // so try to retrieve it to check that the caller is one.

                getActiveAdminForCallerLocked(

                        null, DeviceAdminInfo.USES_POLICY_WATCH_LOGIN, parent);

            }



            DevicePolicyData policy = getUserDataUnchecked(getCredentialOwner(userHandle, parent));