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

* commit '1663c75fa7e83547f3aefc6128f2b90776de5639': Make the NullVibrator really null.
2015-08-06 14:05:21 +00:00
parent 43a95cf1cd 1663c75fa7
commit b9bdde13f5
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);
    }

    /**