Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "DO NOT MERGE Prevent apps from creating blocked channel groups" into qt-dev

Browse Source
This commit is contained in:
Julia Reynolds
2022-01-21 02:33:54 +00:00
committed by Android (Google) Code Review
parent 13ad919ff5 b993531c0d
commit f1dc5b1ee1
2 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/core/java/com/android/server/notification/PreferencesHelper.java
View File

@@ -589,6 +589,9 @@ public class PreferencesHelper implements RankingConfig {
if (r == null) { if (r == null) {
throw new IllegalArgumentException("Invalid package"); throw new IllegalArgumentException("Invalid package");
} }
if (fromTargetApp) {
group.setBlocked(false);
}
final NotificationChannelGroup oldGroup = r.groups.get(group.getId()); final NotificationChannelGroup oldGroup = r.groups.get(group.getId());
if (!group.equals(oldGroup)) { if (!group.equals(oldGroup)) {
// will log for new entries as well as name/description changes // will log for new entries as well as name/description changes

13
services/tests/uiservicestests/src/com/android/server/notification/PreferencesHelperTest.java
View File

@@ -2030,6 +2030,19 @@ public class PreferencesHelperTest extends UiServiceTestCase {
assertTrue(mHelper.isGroupBlocked(PKG_N_MR1, UID_N_MR1, group.getId())); assertTrue(mHelper.isGroupBlocked(PKG_N_MR1, UID_N_MR1, group.getId()));
} }
@Test
public void testIsGroupBlocked_appCannotCreateAsBlocked() throws Exception {
NotificationChannelGroup group = new NotificationChannelGroup("id", "name");
group.setBlocked(true);
mHelper.createNotificationChannelGroup(PKG_N_MR1, UID_N_MR1, group, true);
assertFalse(mHelper.isGroupBlocked(PKG_N_MR1, UID_N_MR1, group.getId()));
NotificationChannelGroup group3 = group.clone();
group3.setBlocked(false);
mHelper.createNotificationChannelGroup(PKG_N_MR1, UID_N_MR1, group3, true);
assertFalse(mHelper.isGroupBlocked(PKG_N_MR1, UID_N_MR1, group.getId()));
}
@Test @Test
public void testIsGroup_appCannotResetBlock() throws Exception { public void testIsGroup_appCannotResetBlock() throws Exception {
NotificationChannelGroup group = new NotificationChannelGroup("id", "name"); NotificationChannelGroup group = new NotificationChannelGroup("id", "name");