Merge "Fix hiding of channel fields" into qt-dev am: c14825c93d

am: b1ec5751c1 Change-Id: I94345bc22e12357a79739cb12fe72067e03d8ba8
2019-05-21 17:30:09 -07:00
parent 309a3d455b b1ec5751c1
commit 85a3096214
2 changed files with 6 additions and 2 deletions
--- a/src/com/android/settings/notification/NotificationPreferenceController.java
+++ b/src/com/android/settings/notification/NotificationPreferenceController.java
@@ -74,7 +74,9 @@ public abstract class NotificationPreferenceController extends AbstractPreferenc
            return false;
        }
        if (mChannelGroup != null) {
-            return !mChannelGroup.isBlocked();
+            if (mChannelGroup.isBlocked()) {
+                return false;
+            }
        }
        if (mChannel != null) {
            return mChannel.getImportance() != IMPORTANCE_NONE;