diff options
| author | Michael Wright <michaelwr@google.com> | 2015-08-06 13:58:05 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-06 13:58:05 +0000 |
| commit | 1663c75fa7e83547f3aefc6128f2b90776de5639 (patch) | |
| tree | 1b4a904fa8d72c21d5916d5b4d1b1ac38eea96a4 /core/java | |
| parent | 44a14ef7b4b5e85bb79c954f99929ec309c42c2e (diff) | |
| parent | d5a6df6d228036258d616245502c1a4f85ba4b2e (diff) | |
am d5a6df6d: Merge "Make the NullVibrator really null." into mnc-dev
* commit 'd5a6df6d228036258d616245502c1a4f85ba4b2e':
Make the NullVibrator really null.
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/os/NullVibrator.java | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/core/java/android/os/NullVibrator.java b/core/java/android/os/NullVibrator.java index f14d96512cef..19b452f323ce 100644 --- 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); } /** |