Limit unconfigurability to specified channels.

am: 80fa6b5833 Change-Id: I63c40ae241f6891fa1e6b85a78dc78d2b918ca6d
2017-06-13 01:45:10 +00:00
parent 34373c8f33 80fa6b5833
commit 665384a8eb
5 changed files with 164 additions and 9 deletions
--- a/src/com/android/settings/notification/AppNotificationSettings.java
+++ b/src/com/android/settings/notification/AppNotificationSettings.java
@@ -211,7 +211,8 @@ public class AppNotificationSettings extends NotificationSettingsBase {
        MasterSwitchPreference channelPref = new MasterSwitchPreference(
                getPrefContext());
        channelPref.setSwitchEnabled(mSuspendedAppsAdmin == null
-                &&  isChannelBlockable(mAppRow.systemApp, channel));
+                && isChannelBlockable(mAppRow.systemApp, channel)
+                && isChannelConfigurable(channel));
        channelPref.setKey(channel.getId());
        channelPref.setTitle(channel.getName());
        channelPref.setChecked(channel.getImportance() != IMPORTANCE_NONE);