Prevent whitelisted apps from blocking and silencing

Change-Id: I34cb5c2c59d56b68ed1500c8c79cd65676c0af25
Fixes: 35841524
Test: manual
This commit is contained in:
Julia Reynolds
2017-03-06 15:24:35 -05:00
parent 6c2f9fe6d7
commit dcee38d02e
4 changed files with 49 additions and 32 deletions

View File

@@ -218,7 +218,7 @@ public class AppNotificationSettings extends NotificationSettingsBase {
}
private void setupBlock() {
if (mAppRow.systemApp) {
if (mAppRow.systemApp && !mAppRow.banned) {
setVisible(mBlock, false);
} else {
mBlock.setDisabledByAdmin(mSuspendedAppsAdmin);
@@ -243,6 +243,9 @@ public class AppNotificationSettings extends NotificationSettingsBase {
setVisible(category, !banned);
}
setVisible(mBadge, !banned);
if (mAppRow.systemApp && !mAppRow.banned) {
setVisible(mBlock, false);
}
}
private Comparator<NotificationChannel> mChannelComparator =