am d5a6df6d: Merge "Make the NullVibrator really null." into mnc-dev

* commit 'd5a6df6d228036258d616245502c1a4f85ba4b2e': Make the NullVibrator really null.
2015-08-06 13:58:05 +00:00
parent 44a14ef7b4 d5a6df6d22
commit 1663c75fa7
1 changed files with 0 additions and 1 deletions
--- a/core/java/android/os/NullVibrator.java
+++ b/core/java/android/os/NullVibrator.java
@@ -43,7 +43,6 @@ public class NullVibrator extends Vibrator {
     */
    @Override
    public void vibrate(int uid, String opPkg, long milliseconds, AudioAttributes attributes) {
-        vibrate(milliseconds);
    }

    /**