diff options
| -rwxr-xr-x | services/java/com/android/server/NotificationManagerService.java | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/services/java/com/android/server/NotificationManagerService.java b/services/java/com/android/server/NotificationManagerService.java index 216323e..f3a38f0 100755 --- a/services/java/com/android/server/NotificationManagerService.java +++ b/services/java/com/android/server/NotificationManagerService.java @@ -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; |