diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2017-05-15 23:21:05 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-05-15 23:21:06 +0000 |
| commit | 0c9dbf507b53a12bdf577ff3e55c1686a2e089de (patch) | |
| tree | 3849f2add85d7abe11151436b3f03f99783157a8 /java/com/android/dialer/notification | |
| parent | e724c7b6376be660abf2113f97c7cbfc34515da8 (diff) | |
| parent | c857f90590e7d7fcffa89511982eb33afd34805f (diff) | |
| download | android_packages_apps_Dialer-0c9dbf507b53a12bdf577ff3e55c1686a2e089de.tar.gz android_packages_apps_Dialer-0c9dbf507b53a12bdf577ff3e55c1686a2e089de.tar.bz2 android_packages_apps_Dialer-0c9dbf507b53a12bdf577ff3e55c1686a2e089de.zip | |
Merge "Update Dialer to v10 RC32" into oc-dev
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); |