Merge "Updated haptic effect for success" into pi-dev am: d6dbebf7ba (21f2c00d) · Commits · e / os / android_frameworks_base

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

+1 −22

Original line number	Original line	Diff line number	Diff line
	@@ -80,7 +80,7 @@ public abstract class ClientMonitor implements IBinder.DeathRecipient {
	mGroupId = groupId;		mGroupId = groupId;
	mIsRestricted = restricted;		mIsRestricted = restricted;
	mOwner = owner;		mOwner = owner;
	mSuccessVibrationEffect = getSuccessVibrationEffect(context);		mSuccessVibrationEffect = VibrationEffect.get(VibrationEffect.EFFECT_CLICK);
	mErrorVibrationEffect = VibrationEffect.get(VibrationEffect.EFFECT_DOUBLE_CLICK);		mErrorVibrationEffect = VibrationEffect.get(VibrationEffect.EFFECT_DOUBLE_CLICK);
	try {		try {
	if (token != null) {		if (token != null) {
	@@ -239,25 +239,4 @@ public abstract class ClientMonitor implements IBinder.DeathRecipient {
	vibrator.vibrate(mErrorVibrationEffect, FINGERPRINT_SONFICATION_ATTRIBUTES);		vibrator.vibrate(mErrorVibrationEffect, FINGERPRINT_SONFICATION_ATTRIBUTES);
	}		}
	}		}

	private static VibrationEffect getSuccessVibrationEffect(Context ctx) {
	int[] arr = ctx.getResources().getIntArray(
	com.android.internal.R.array.config_longPressVibePattern);
	final long[] vibePattern;
	if (arr == null \|\| arr.length == 0) {
	vibePattern = DEFAULT_SUCCESS_VIBRATION_PATTERN;
	} else {
	vibePattern = new long[arr.length];
	for (int i = 0; i < arr.length; i++) {
	vibePattern[i] = arr[i];
	}
	}
	if (vibePattern.length == 1) {
	return VibrationEffect.createOneShot(
	vibePattern[0], VibrationEffect.DEFAULT_AMPLITUDE);
	} else {
	return VibrationEffect.createWaveform(vibePattern, -1);
	}
	}

	}		}