diff --git a/KeyHandler/AndroidManifest.xml b/KeyHandler/AndroidManifest.xml
index 4b74ee3..ea8e344 100644
--- a/KeyHandler/AndroidManifest.xml
+++ b/KeyHandler/AndroidManifest.xml
@@ -17,4 +17,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           android:sharedUserId="android.uid.system"
           package="org.lineageos.settings.device">
+    <uses-permission android:name="android.permission.VIBRATE" />
 </manifest>
diff --git a/KeyHandler/src/org/lineageos/settings/device/KeyHandler.java b/KeyHandler/src/org/lineageos/settings/device/KeyHandler.java
index 49312a9..8cf4cf1 100644
--- a/KeyHandler/src/org/lineageos/settings/device/KeyHandler.java
+++ b/KeyHandler/src/org/lineageos/settings/device/KeyHandler.java
@@ -18,6 +18,7 @@ package org.lineageos.settings.device;
 
 import android.content.Context;
 import android.media.AudioManager;
+import android.os.VibrationEffect;
 import android.os.Vibrator;
 import android.view.KeyEvent;
 
@@ -64,10 +65,9 @@ public class KeyHandler implements DeviceKeyHandler {
     }
 
     private void doHapticFeedback() {
-        if (mVibrator == null || !mVibrator.hasVibrator()) {
-            return;
+        if (mVibrator != null && mVibrator.hasVibrator()) {
+            mVibrator.vibrate(VibrationEffect.createOneShot(50,
+                    VibrationEffect.DEFAULT_AMPLITUDE));
         }
-
-        mVibrator.vibrate(50);
     }
 }