diff options
| author | David Agnew <dsandler@android.com> | 2012-11-09 23:03:26 -0500 |
|---|---|---|
| committer | The Android Automerger <android-build@android.com> | 2012-11-09 22:51:37 -0800 |
| commit | 9a7debe5857ffc7c71cfc4082b1b6d72a5cf81cd (patch) | |
| tree | 32712103f6b48145a8496faed8792007ed78b7d4 /services/java/com/android/server/NotificationManagerService.java | |
| parent | 5624af28af859b6cc4fcb82c338f5625d2502a23 (diff) | |
| download | frameworks_base-9a7debe5857ffc7c71cfc4082b1b6d72a5cf81cd.zip frameworks_base-9a7debe5857ffc7c71cfc4082b1b6d72a5cf81cd.tar.gz frameworks_base-9a7debe5857ffc7c71cfc4082b1b6d72a5cf81cd.tar.bz2 | |
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
Diffstat (limited to 'services/java/com/android/server/NotificationManagerService.java')
| -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; |