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

Change-Id: Ic0b0645779a3ca80c841b83c21f2f93cc2bdf5c5
2020-03-31 05:00:16 +00:00
parent a5de5f20bf 41874f9f73
commit 139f0ccf07
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) {