When in vibrate mode, all notifications will vibrate.

(Unless the notification specifies no ringtone AND no
vibration, in which case it will remain silent.)

Change-Id: I926d0fe0165b9622cd117e6c3ef6e3637772b444
This commit is contained in:
David Agnew
2012-11-09 23:03:26 -05:00
committed by The Android Automerger
parent 5624af28af
commit 9a7debe585

View File

@@ -1086,8 +1086,17 @@ public class NotificationManagerService extends INotificationManager.Stub
}
// vibrate
// new in 4.2: if there was supposed to be a sound and we're in vibrate mode,
// we always vibrate, even if no vibration was specified
final boolean convertSoundToVibration =
notification.vibrate == null
&& (useDefaultSound || notification.sound != null)
&& (audioManager.getRingerMode() == AudioManager.RINGER_MODE_VIBRATE);
final boolean useDefaultVibrate =
(notification.defaults & Notification.DEFAULT_VIBRATE) != 0;
(notification.defaults & Notification.DEFAULT_VIBRATE) != 0
|| convertSoundToVibration;
if ((useDefaultVibrate || notification.vibrate != null)
&& !(audioManager.getRingerMode() == AudioManager.RINGER_MODE_SILENT)) {
mVibrateNotification = r;