summaryrefslogtreecommitdiff
path: root/src/com/android/deskclock/alarms/AlarmKlaxon.java
diff options
context:
space:
mode:
Diffstat (limited to 'src/com/android/deskclock/alarms/AlarmKlaxon.java')
-rw-r--r--src/com/android/deskclock/alarms/AlarmKlaxon.java18
1 files changed, 4 insertions, 14 deletions
diff --git a/src/com/android/deskclock/alarms/AlarmKlaxon.java b/src/com/android/deskclock/alarms/AlarmKlaxon.java
index a1624239f..c79df9d2b 100644
--- a/src/com/android/deskclock/alarms/AlarmKlaxon.java
+++ b/src/com/android/deskclock/alarms/AlarmKlaxon.java
@@ -16,7 +16,6 @@
package com.android.deskclock.alarms;
-import android.annotation.TargetApi;
import android.content.Context;
import android.media.AudioAttributes;
import android.os.Build;
@@ -61,24 +60,15 @@ final class AlarmKlaxon {
if (instance.mVibrate) {
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));
}