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

* commit 'a7b3694c56dfc85a4edbb868815ee3dd0998a5b9': Make the NullVibrator really null.
2015-08-06 14:18:50 +00:00
parent 9fa41b2dcb a7b3694c56
commit d239bb5ebd
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);
    }

    /**