Do not vibrate if last acquire message was NOT_DETECTED (0ce70856) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/biometrics/AuthenticationClient.java

+6 −0

Original line number	Diff line number	Diff line
		@@ -63,6 +63,8 @@ public abstract class AuthenticationClient extends ClientMonitor {
		*/
		public abstract boolean shouldFrameworkHandleLockout();

		public abstract boolean wasUserDetected();

		public AuthenticationClient(Context context, Constants constants,
		BiometricServiceBase.DaemonWrapper daemon, long halDeviceId, IBinder token,
		BiometricServiceBase.ServiceListener listener, int targetUserId, int groupId, long opId,
		@@ -105,6 +107,10 @@ public abstract class AuthenticationClient extends ClientMonitor {
		if (!shouldFrameworkHandleLockout()) {
		switch (error) {
		case BiometricConstants.BIOMETRIC_ERROR_TIMEOUT:
		if (!wasUserDetected() && !isBiometricPrompt()) {
		// No vibration if user was not detected on keyguard
		break;
		}
		case BiometricConstants.BIOMETRIC_ERROR_LOCKOUT:
		case BiometricConstants.BIOMETRIC_ERROR_LOCKOUT_PERMANENT:
		if (mStarted) {

services/core/java/com/android/server/biometrics/face/FaceService.java

+10 −1

Original line number	Diff line number	Diff line
		@@ -64,8 +64,8 @@ import com.android.server.SystemServerInitThreadPool;
		import com.android.server.biometrics.AuthenticationClient;
		import com.android.server.biometrics.BiometricServiceBase;
		import com.android.server.biometrics.BiometricUtils;
		import com.android.server.biometrics.EnumerateClient;
		import com.android.server.biometrics.Constants;
		import com.android.server.biometrics.EnumerateClient;
		import com.android.server.biometrics.RemovalClient;

		import org.json.JSONArray;
		@@ -98,6 +98,8 @@ public class FaceService extends BiometricServiceBase {
		private static final int CHALLENGE_TIMEOUT_SEC = 600; // 10 minutes

		private final class FaceAuthClient extends AuthenticationClientImpl {
		private int mLastAcquire;

		public FaceAuthClient(Context context,
		DaemonWrapper daemon, long halDeviceId, IBinder token,
		ServiceListener listener, int targetUserId, int groupId, long opId,
		@@ -116,6 +118,11 @@ public class FaceService extends BiometricServiceBase {
		return false;
		}

		@Override
		public boolean wasUserDetected() {
		return mLastAcquire != FaceManager.FACE_ACQUIRED_NOT_DETECTED;
		}

		@Override
		public boolean onAuthenticated(BiometricAuthenticator.Identifier identifier,
		boolean authenticated, ArrayList<Byte> token) {
		@@ -153,6 +160,8 @@ public class FaceService extends BiometricServiceBase {
		@Override
		public boolean onAcquired(int acquireInfo, int vendorCode) {

		mLastAcquire = acquireInfo;

		if (acquireInfo == FaceManager.FACE_ACQUIRED_RECALIBRATE) {
		final String name =
		getContext().getString(R.string.face_recalibrate_notification_name);

services/core/java/com/android/server/biometrics/fingerprint/FingerprintService.java

+7 −1

Original line number	Diff line number	Diff line
		@@ -67,8 +67,8 @@ import com.android.server.biometrics.AuthenticationClient;
		import com.android.server.biometrics.BiometricServiceBase;
		import com.android.server.biometrics.BiometricUtils;
		import com.android.server.biometrics.ClientMonitor;
		import com.android.server.biometrics.EnumerateClient;
		import com.android.server.biometrics.Constants;
		import com.android.server.biometrics.EnumerateClient;
		import com.android.server.biometrics.RemovalClient;

		import org.json.JSONArray;
		@@ -152,6 +152,12 @@ public class FingerprintService extends BiometricServiceBase {
		return true;
		}

		@Override
		public boolean wasUserDetected() {
		// TODO: Return a proper value for devices that use ERROR_TIMEOUT
		return false;
		}

		@Override
		public int handleFailedAttempt() {
		final int currentUser = ActivityManager.getCurrentUser();