Merge "Allow some system channels to be blocked" into oc-dev am: 540e8f50e3

am: 166a994a4c

Change-Id: Ide3aeac0c328f08becc693795ef5553fa0c9a281

src/com/android/settings/notification/NotificationSettingsBase.java

@@ -443,4 +443,12 @@ abstract public class NotificationSettingsBase extends SettingsPreferenceFragmen
 
         return lockscreenSecure;
     }
+
+    protected boolean isChannelBlockable(boolean systemApp, NotificationChannel channel) {
+        if (!mAppRow.systemApp) {
+            return true;
+        }
+        return channel.isBlockableSystem()
+                || channel.getImportance() == NotificationManager.IMPORTANCE_NONE;
+    }
 }