DeskClock: Remove compatibility to old APIsHEADsugisawa-mr1

* We never build on these, so the code and annotations are useless

Change-Id: I791370b531ecadcbddb63ca04d5c4c51aafe1bc1

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));
     }