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

Commit cf1a62e8 authored by Kevin Chyn's avatar Kevin Chyn
Browse files

Fix SyntheticPasswordTests 

Move the biometric check to the injector so it can be ignored for tests

Test: atest SyntheticPasswordTests
Change-Id: I261edac299bbda5205b0759670def073a46dc49a
parent 7f7ec2f2

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

+5 −1
Original line number Diff line number Diff line
@@ -405,6 +405,10 @@ public class LockSettingsService extends ILockSettings.Stub { 
            return new SyntheticPasswordManager(getContext(), storage, getUserManager());

        }



        public boolean hasBiometrics() {

            return BiometricManager.hasBiometrics(mContext);

        }



        public int binderGetCallingUid() {

            return Binder.getCallingUid();

        }
@@ -2423,7 +2427,7 @@ public class LockSettingsService extends ILockSettings.Stub { 
            notifyActivePasswordMetricsAvailable(userCredential, userId);

            unlockKeystore(authResult.authToken.deriveKeyStorePassword(), userId);

            // Reset lockout

            if (BiometricManager.hasBiometrics(mContext)) {

            if (mInjector.hasBiometrics()) {

                BiometricManager bm = mContext.getSystemService(BiometricManager.class);

                Slog.i(TAG, "Resetting lockout, length: "

                        + authResult.gkResponse.getPayload().length);

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

+5 −0
Original line number Diff line number Diff line
@@ -103,6 +103,11 @@ public class LockSettingsServiceTestable extends LockSettingsService { 
            return mSpManager;

        }



        @Override

        public boolean hasBiometrics() {

            return false;

        }



        @Override

        public int binderGetCallingUid() {

            return Process.SYSTEM_UID;