From cf1a62e830010090dc5774900300182ae09c35f6 Mon Sep 17 00:00:00 2001 From: Kevin Chyn Date: Thu, 21 Feb 2019 11:11:59 -0800 Subject: Fix SyntheticPasswordTests Move the biometric check to the injector so it can be ignored for tests Test: atest SyntheticPasswordTests Change-Id: I261edac299bbda5205b0759670def073a46dc49a --- .../java/com/android/server/locksettings/LockSettingsService.java | 6 +++++- .../android/server/locksettings/LockSettingsServiceTestable.java | 5 +++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/services/core/java/com/android/server/locksettings/LockSettingsService.java b/services/core/java/com/android/server/locksettings/LockSettingsService.java index 4b4788cd4a16..7f8275bae88f 100644 --- a/services/core/java/com/android/server/locksettings/LockSettingsService.java +++ b/services/core/java/com/android/server/locksettings/LockSettingsService.java @@ -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); diff --git a/services/tests/servicestests/src/com/android/server/locksettings/LockSettingsServiceTestable.java b/services/tests/servicestests/src/com/android/server/locksettings/LockSettingsServiceTestable.java index fe683abe7e1b..d53850d9a5df 100644 --- a/services/tests/servicestests/src/com/android/server/locksettings/LockSettingsServiceTestable.java +++ b/services/tests/servicestests/src/com/android/server/locksettings/LockSettingsServiceTestable.java @@ -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; -- cgit v1.2.3-59-g8ed1b