Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "When in vibrate mode, all notifications will vibrate." into jb-mr1.1-dev

Browse Source
This commit is contained in:
Ed Heyl
2012-11-09 22:49:34 -08:00
committed by Android (Google) Code Review
parent e72e2b74bf 71789e11cc
commit 4f017e757b
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
services/java/com/android/server/NotificationManagerService.java
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;