Merge "Fix SyntheticPasswordTests" (7464798a) · Commits · e / os / android_frameworks_base

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

+5 −1

Original line number	Diff line number	Diff line
		@@ -407,6 +407,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();
		}
		@@ -2434,7 +2438,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);

+5 −0

Original line number	Diff line number	Diff line
		@@ -105,6 +105,11 @@ public class LockSettingsServiceTestable extends LockSettingsService {
		return mSpManager;
		}

		@Override
		public boolean hasBiometrics() {
		return false;
		}

		@Override
		public int binderGetCallingUid() {
		return Process.SYSTEM_UID;