Merge "Fix hiding of channel fields" into qt-dev

am: c14825c93d Change-Id: Iac8ac8a6322872a3d77738b95a465ec39e144cab
2019-05-22 00:55:59 -07:00
parent b9e435f95b c14825c93d
commit 8d3520eafd
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;