diff options
| author | Michael Wright <michaelwr@google.com> | 2015-08-06 13:52:34 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-08-06 13:52:34 +0000 |
| commit | d5a6df6d228036258d616245502c1a4f85ba4b2e (patch) | |
| tree | cf4c50532f4024b846ff11da1352880b9cb2e318 /core/java/android/os | |
| parent | eb7e3d7e456177f7848834759b9a7f6f78a05f7a (diff) | |
| parent | 5e829abd71448d37a73f7ba0953c8398d4b48da6 (diff) | |
| download | frameworks_base-d5a6df6d228036258d616245502c1a4f85ba4b2e.zip frameworks_base-d5a6df6d228036258d616245502c1a4f85ba4b2e.tar.gz frameworks_base-d5a6df6d228036258d616245502c1a4f85ba4b2e.tar.bz2 | |
Merge "Make the NullVibrator really null." into mnc-dev
Diffstat (limited to 'core/java/android/os')
| -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 f14d965..19b452f 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); } /** |