diff options
| author | Daniel Sandler <dsandler@android.com> | 2010-04-12 13:23:57 -0400 |
|---|---|---|
| committer | Daniel Sandler <dsandler@android.com> | 2010-04-13 12:18:44 -0400 |
| commit | bcac496076ef6f439147e7a2be71e8a2b76ddede (patch) | |
| tree | a12b89da4fdbd6064efd1e0ef5dc97c4f0606d4a /media/java | |
| parent | 15683534d1f1ca76a9a59ed921219db46ff5f800 (diff) | |
| download | frameworks_base-bcac496076ef6f439147e7a2be71e8a2b76ddede.zip frameworks_base-bcac496076ef6f439147e7a2be71e8a2b76ddede.tar.gz frameworks_base-bcac496076ef6f439147e7a2be71e8a2b76ddede.tar.bz2 | |
Honor the "Never vibrate" setting for incoming calls.
Bug: 2579295
Change-Id: Ia4207492c5dfa2c39d27372c4892b60121b6d9e8
Diffstat (limited to 'media/java')
| -rw-r--r-- | media/java/android/media/AudioService.java | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/media/java/android/media/AudioService.java b/media/java/android/media/AudioService.java index 45497e9..87ccaaf 100644 --- a/media/java/android/media/AudioService.java +++ b/media/java/android/media/AudioService.java @@ -601,10 +601,8 @@ public class AudioService extends IAudioService.Stub { return mRingerMode == AudioManager.RINGER_MODE_VIBRATE; case AudioManager.VIBRATE_SETTING_OFF: - // Phone ringer should always vibrate in vibrate mode - if (vibrateType == AudioManager.VIBRATE_TYPE_RINGER) { - return mRingerMode == AudioManager.RINGER_MODE_VIBRATE; - } + // return false, even for incoming calls + return false; default: return false; |