diff --git a/src/com/android/settings/notification/app/BlockPreferenceController.java b/src/com/android/settings/notification/app/BlockPreferenceController.java index 589a03db614..e5a7e980c5f 100644 --- a/src/com/android/settings/notification/app/BlockPreferenceController.java +++ b/src/com/android/settings/notification/app/BlockPreferenceController.java @@ -16,6 +16,7 @@ package com.android.settings.notification.app; +import static android.app.NotificationManager.IMPORTANCE_LOW; import static android.app.NotificationManager.IMPORTANCE_NONE; import static android.app.NotificationManager.IMPORTANCE_UNSPECIFIED; @@ -107,7 +108,7 @@ public class BlockPreferenceController extends NotificationPreferenceController ? IMPORTANCE_NONE : isDefaultChannel() ? IMPORTANCE_UNSPECIFIED - : mChannel.getOriginalImportance(); + : Math.max(mChannel.getOriginalImportance(), IMPORTANCE_LOW); mChannel.setImportance(importance); saveChannel(); } diff --git a/src/com/android/settings/notification/app/ChannelListPreferenceController.java b/src/com/android/settings/notification/app/ChannelListPreferenceController.java index 8410ce13a4c..5fd607f0adf 100644 --- a/src/com/android/settings/notification/app/ChannelListPreferenceController.java +++ b/src/com/android/settings/notification/app/ChannelListPreferenceController.java @@ -339,7 +339,9 @@ public class ChannelListPreferenceController extends NotificationPreferenceContr channelPref.setOnPreferenceChangeListener( (preference, o) -> { boolean value = (Boolean) o; - int importance = value ? channel.getOriginalImportance() : IMPORTANCE_NONE; + int importance = value + ? Math.max(channel.getOriginalImportance(), IMPORTANCE_LOW) + : IMPORTANCE_NONE; channel.setImportance(importance); channel.lockFields(NotificationChannel.USER_LOCKED_IMPORTANCE); PrimarySwitchPreference channelPref1 = (PrimarySwitchPreference) preference;