diff options
| author | Eric Erfanian <erfanian@google.com> | 2017-05-15 14:05:33 -0700 |
|---|---|---|
| committer | Eric Erfanian <erfanian@google.com> | 2017-05-15 14:48:12 -0700 |
| commit | c857f90590e7d7fcffa89511982eb33afd34805f (patch) | |
| tree | 9910fb95c6fdb10b06ee8be02a3374d2882005b9 /java/com/android/dialer/notification | |
| parent | 738bb09adee2b56c99063a0264f8f76de393143b (diff) | |
Update Dialer to v10 RC32
This release was created following the instructions at:
go/dialer-aosp-release
Subsequent dialer releases will follow as O bugs are
fixed, until we reach our final RC.
Version: 10
Candidate: RC32
Branch: dialer-android_release_branch/153304843.1
dialer-android_20170416.00/dialer-android_20170416.00_RC32
This release contains the following bug fixes since RC17:
Bug: 33176679 33272455 3646510 36773894 37297649 37413780
37513689 37640315 37680595 37698062 37873639 37901752
37919295 37953423 38062852 38069600 38137349 38173549
38180252 38191514
Test: make, on device
Change-Id: I4e4bb630082758e418ff24892b7db3142c6eb09a
Diffstat (limited to 'java/com/android/dialer/notification')
| -rw-r--r-- | java/com/android/dialer/notification/NotificationChannelManager.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/java/com/android/dialer/notification/NotificationChannelManager.java b/java/com/android/dialer/notification/NotificationChannelManager.java index ef0f5f17a..599e5ca59 100644 --- a/java/com/android/dialer/notification/NotificationChannelManager.java +++ b/java/com/android/dialer/notification/NotificationChannelManager.java @@ -340,8 +340,10 @@ public class NotificationChannelManager { NotificationChannel channel = new NotificationChannel(channelId, name, importance); channel.setShowBadge(canShowBadge); if (sound != null) { + // silentRingtone acts as a sentinel value to indicate that setSound should still be called, + // but with a null value to indicate no sound. channel.setSound( - sound, + sound.equals(silentRingtone) ? null : sound, new AudioAttributes.Builder().setUsage(AudioAttributes.USAGE_NOTIFICATION).build()); } channel.enableLights(lights); |