| Chunk |
|---|
| Conflicting content |
|---|
// and no other vibration is specified, we apply the default vibration anyway
final boolean convertSoundToVibration =
!hasCustomVibrate
<<<<<<< HEAD
&& hasValidSound
=======
&& (useDefaultSound || notification.sound != null)
>>>>>>> aaec726948078dad0bcc5cbbb41bb2ee6a5a085b
&& (audioManager.getRingerMode() == AudioManager.RINGER_MODE_VIBRATE);
// The DEFAULT_VIBRATE flag trumps any custom vibration. |
| Solution content |
|---|
// and no other vibration is specified, we apply the default vibration anyway
final boolean convertSoundToVibration =
!hasCustomVibrate
&& hasValidSound
&& (audioManager.getRingerMode() == AudioManager.RINGER_MODE_VIBRATE);
// The DEFAULT_VIBRATE flag trumps any custom vibration. |
| File |
|---|
| NotificationManagerService.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Attribute |
| Variable |