diff options
| author | Michael Wright <michaelwr@google.com> | 2015-08-06 14:05:21 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-06 14:05:21 +0000 |
| commit | b9bdde13f50af73597e5b8a951da8698ee3f8fae (patch) | |
| tree | a1b0d0913b33f003450d4788afcc440c5d9ccb91 /core/java/android | |
| parent | 43a95cf1cdf5cd62b81af3222d194a0873ad6933 (diff) | |
| parent | 1663c75fa7e83547f3aefc6128f2b90776de5639 (diff) | |
am 1663c75f: am d5a6df6d: Merge "Make the NullVibrator really null." into mnc-dev
* commit '1663c75fa7e83547f3aefc6128f2b90776de5639':
Make the NullVibrator really null.
Diffstat (limited to 'core/java/android')
| -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); } /** |