am ac9fbe9d: Merge "Do not vibrate if we don\'t have a fingerprint client" into mnc-dr-dev (24cf8349) · Commits · e / os / android_frameworks_base

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

+6 −2

Original line number	Original line	Diff line number	Diff line
	@@ -589,10 +589,14 @@ public class FingerprintService extends SystemService implements IBinder.DeathRe
	result = true; // client not listening		result = true; // client not listening
	}		}
	if (fpId == 0) {		if (fpId == 0) {
			if (receiver != null) {
	FingerprintUtils.vibrateFingerprintError(getContext());		FingerprintUtils.vibrateFingerprintError(getContext());
			}
	result \|= handleFailedAttempt(this);		result \|= handleFailedAttempt(this);
	} else {		} else {
			if (receiver != null) {
	FingerprintUtils.vibrateFingerprintSuccess(getContext());		FingerprintUtils.vibrateFingerprintSuccess(getContext());
			}
	result \|= true; // we have a valid fingerprint		result \|= true; // we have a valid fingerprint
	mLockoutReset.run();		mLockoutReset.run();
	}		}