| commit | d5a6df6d228036258d616245502c1a4f85ba4b2e | [log] [tgz] |
|---|---|---|
| author | Michael Wright <michaelwr@google.com> | Thu Aug 06 13:52:34 2015 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Aug 06 13:52:34 2015 +0000 |
| tree | cf4c50532f4024b846ff11da1352880b9cb2e318 | |
| parent | eb7e3d7e456177f7848834759b9a7f6f78a05f7a [diff] | |
| parent | 5e829abd71448d37a73f7ba0953c8398d4b48da6 [diff] |
Merge "Make the NullVibrator really null." into mnc-dev
diff --git a/core/java/android/os/NullVibrator.java b/core/java/android/os/NullVibrator.java index f14d965..19b452f 100644 --- a/core/java/android/os/NullVibrator.java +++ b/core/java/android/os/NullVibrator.java
@@ -43,7 +43,6 @@ */ @Override public void vibrate(int uid, String opPkg, long milliseconds, AudioAttributes attributes) { - vibrate(milliseconds); } /**