summaryrefslogtreecommitdiff
path: root/src/com/android/deskclock/timer/TimerKlaxon.java
diff options
context:
space:
mode:
Diffstat (limited to 'src/com/android/deskclock/timer/TimerKlaxon.java')
-rw-r--r--src/com/android/deskclock/timer/TimerKlaxon.java18
1 files changed, 4 insertions, 14 deletions
diff --git a/src/com/android/deskclock/timer/TimerKlaxon.java b/src/com/android/deskclock/timer/TimerKlaxon.java
index 1c40b4a4d..1b8707efb 100644
--- a/src/com/android/deskclock/timer/TimerKlaxon.java
+++ b/src/com/android/deskclock/timer/TimerKlaxon.java
@@ -16,7 +16,6 @@
package com.android.deskclock.timer;
-import android.annotation.TargetApi;
import android.content.Context;
import android.media.AudioAttributes;
import android.net.Uri;
@@ -67,23 +66,14 @@ public abstract class TimerKlaxon {
if (DataModel.getDataModel().getTimerVibrate()) {
final Vibrator vibrator = getVibrator(context);
- if (Utils.isLOrLater()) {
- vibrateLOrLater(vibrator);
- } else {
- vibrator.vibrate(VIBRATE_PATTERN, 0);
- }
+ vibrator.vibrate(VIBRATE_PATTERN, 0, new AudioAttributes.Builder()
+ .setUsage(AudioAttributes.USAGE_ALARM)
+ .setContentType(AudioAttributes.CONTENT_TYPE_SONIFICATION)
+ .build());
}
sStarted = true;
}
- @TargetApi(Build.VERSION_CODES.LOLLIPOP)
- private static void vibrateLOrLater(Vibrator vibrator) {
- vibrator.vibrate(VIBRATE_PATTERN, 0, new AudioAttributes.Builder()
- .setUsage(AudioAttributes.USAGE_ALARM)
- .setContentType(AudioAttributes.CONTENT_TYPE_SONIFICATION)
- .build());
- }
-
private static Vibrator getVibrator(Context context) {
return ((Vibrator) context.getSystemService(Context.VIBRATOR_SERVICE));
}