Merge "Update Dialer to v10 RC32" into oc-dev

am: 0c9dbf507b

Change-Id: I5f90090090c6e430d83fcdd294082c1f5237ade8

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);