Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9a7debe5 authored by David Agnew's avatar David Agnew Committed by The Android Automerger
Browse files

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
parent 5624af28
Loading
Loading
Loading
Loading
+10 −1
Original line number Diff line number Diff line
@@ -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;