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

Commit 93b4ed4c authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Force LSKF in ConfirmCredential UI when pending escrow token exists"

parents 4687d70d fc06773c

core/java/com/android/internal/widget/ILockSettings.aidl

+1 −0
Original line number Diff line number Diff line
@@ -62,6 +62,7 @@ interface ILockSettings { 
    void systemReady();

    void userPresent(int userId);

    int getStrongAuthForUser(int userId);

    boolean hasPendingEscrowToken(int userId);



    // Keystore RecoveryController methods.

    // {@code ServiceSpecificException} may be thrown to signal an error, which caller can

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

+13 −1
Original line number Diff line number Diff line
@@ -1638,7 +1638,7 @@ public class LockPatternUtils { 
    }



    /**

     * @see StrongAuthTracker#isFingerprintAllowedForUser

     * @see StrongAuthTracker#isBiometricAllowedForUser(int)

     */

    public boolean isBiometricAllowedForUser(int userId) {

        return (getStrongAuthForUser(userId) & ~StrongAuthTracker.ALLOWING_BIOMETRIC) == 0;
@@ -1979,6 +1979,18 @@ public class LockPatternUtils { 
        return getLong(SYNTHETIC_PASSWORD_ENABLED_KEY, 0, UserHandle.USER_SYSTEM) != 0;

    }



    /**

     * Returns whether the given user has pending escrow tokens

     */

    public boolean hasPendingEscrowToken(int userId) {

        try {

            return getLockSettings().hasPendingEscrowToken(userId);

        } catch (RemoteException e) {

            e.rethrowFromSystemServer();

        }

        return false;

    }



    /**

     * Return true if the device supports the lock screen feature, false otherwise.

     */

services/core/java/com/android/server/locksettings/LockSettingsService.java

+8 −0
Original line number Diff line number Diff line
@@ -2699,6 +2699,14 @@ public class LockSettingsService extends ILockSettings.Stub { 
        }

    }



    @Override

    public boolean hasPendingEscrowToken(int userId) {

        checkPasswordReadPermission(userId);

        synchronized (mSpManager) {

            return !mSpManager.getPendingTokensForUser(userId).isEmpty();

        }

    }



    private boolean removeEscrowToken(long handle, int userId) {

        synchronized (mSpManager) {

            if (handle == getSyntheticPasswordHandleLocked(userId)) {

services/core/java/com/android/server/locksettings/SyntheticPasswordManager.java

+1 −1
Original line number Diff line number Diff line
@@ -751,7 +751,7 @@ public class SyntheticPasswordManager { 


    /**

     * Create a token based Synthetic password for the given user.

     * @return

     * @return the handle of the token

     */

    public long createTokenBasedSyntheticPassword(byte[] token, int userId,

            @Nullable EscrowTokenStateChangeCallback changeCallback) {

services/tests/servicestests/src/com/android/server/locksettings/SyntheticPasswordTests.java

+3 −0
Original line number Diff line number Diff line
@@ -338,12 +338,15 @@ public class SyntheticPasswordTests extends BaseLockSettingsServiceTests { 
        initializeCredentialUnderSP(password, PRIMARY_USER_ID);

        final byte[] storageKey = mStorageManager.getUserUnlockToken(PRIMARY_USER_ID);



        assertFalse(mService.hasPendingEscrowToken(PRIMARY_USER_ID));

        long handle = mLocalService.addEscrowToken(token, PRIMARY_USER_ID, null);

        assertFalse(mLocalService.isEscrowTokenActive(handle, PRIMARY_USER_ID));

        assertTrue(mService.hasPendingEscrowToken(PRIMARY_USER_ID));



        mService.verifyCredential(password, LockPatternUtils.CREDENTIAL_TYPE_PASSWORD, 0,

                PRIMARY_USER_ID).getResponseCode();

        assertTrue(mLocalService.isEscrowTokenActive(handle, PRIMARY_USER_ID));

        assertFalse(mService.hasPendingEscrowToken(PRIMARY_USER_ID));



        mLocalService.setLockCredentialWithToken(pattern, LockPatternUtils.CREDENTIAL_TYPE_PATTERN,

                handle, token, PASSWORD_QUALITY_SOMETHING, PRIMARY_USER_ID);