Merge "Conversations can't individually bypass dnd" into rvc-dev

2020-03-30 19:57:48 +00:00
parent 2f77fd08e9 56d0f6b03a
commit b3f2c0d528
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) {