Merge "Conversations can't individually bypass dnd" into rvc-dev am: b3f2c0d528 am: 6d30804cec

Change-Id: I2ea539acf7f6427021016d7fe6d102e869cce456
2020-03-30 20:38:54 +00:00
parent 19ba74919f 6d30804cec
commit 639b6f89ea
2 changed files with 3 additions and 0 deletions
--- a/src/com/android/settings/notification/app/ConversationPromotePreferenceController.java
+++ b/src/com/android/settings/notification/app/ConversationPromotePreferenceController.java
@@ -66,6 +66,7 @@ public class ConversationPromotePreferenceController extends NotificationPrefere
            return false;
        }
        mChannel.setDemoted(false);
+        mChannel.setBypassDnd(false);
        saveChannel();

        if (mHostFragment != null) {