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

Merge "Allow users to block notification channels" into tm-dev

Browse Source
This commit is contained in:
Julia Reynolds
2022-05-02 17:17:07 +00:00
committed by Android (Google) Code Review
parent f4adad3636 f7ec124b5d
commit 73871cad72
2 changed files with 41 additions and 1 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

@@ -1116,7 +1116,8 @@ public class PreferencesHelper implements RankingConfig {
} }
if (mPermissionHelper.isMigrationEnabled()) { if (mPermissionHelper.isMigrationEnabled()) {
if (mPermissionHelper.isPermissionFixed(r.pkg, UserHandle.getUserId(r.uid))) { if (mPermissionHelper.isPermissionFixed(r.pkg, UserHandle.getUserId(r.uid))
&& !(channel.isBlockable() || channel.getImportance() == IMPORTANCE_NONE)) {
updatedChannel.setImportance(channel.getImportance()); updatedChannel.setImportance(channel.getImportance());
} }
} else { } else {

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

@@ -4015,6 +4015,45 @@ public class PreferencesHelperTest extends UiServiceTestCase {
mHelper.getNotificationChannel(PKG_O, UID_O, a.getId(), false).canBubble()); mHelper.getNotificationChannel(PKG_O, UID_O, a.getId(), false).canBubble());
} }
@Test
public void testUpdateNotificationChannel_fixedPermission_butUserPreviouslyBlockedIt() {
when(mPermissionHelper.isMigrationEnabled()).thenReturn(true);
when(mPermissionHelper.isPermissionFixed(PKG_O, 0)).thenReturn(true);
NotificationChannel a = new NotificationChannel("a", "a", IMPORTANCE_NONE);
mHelper.createNotificationChannel(PKG_O, UID_O, a, false, false);
NotificationChannel update = new NotificationChannel("a", "a", IMPORTANCE_HIGH);
update.setAllowBubbles(false);
mHelper.updateNotificationChannel(PKG_O, UID_O, update, true);
assertEquals(IMPORTANCE_HIGH,
mHelper.getNotificationChannel(PKG_O, UID_O, a.getId(), false).getImportance());
assertEquals(false,
mHelper.getNotificationChannel(PKG_O, UID_O, a.getId(), false).canBubble());
}
@Test
public void testUpdateNotificationChannel_fixedPermission_butAppAllowsIt() {
when(mPermissionHelper.isMigrationEnabled()).thenReturn(true);
when(mPermissionHelper.isPermissionFixed(PKG_O, 0)).thenReturn(true);
NotificationChannel a = new NotificationChannel("a", "a", IMPORTANCE_HIGH);
a.setBlockable(true);
mHelper.createNotificationChannel(PKG_O, UID_O, a, true, false);
NotificationChannel update = new NotificationChannel("a", "a", IMPORTANCE_NONE);
update.setAllowBubbles(false);
mHelper.updateNotificationChannel(PKG_O, UID_O, update, true);
assertEquals(IMPORTANCE_NONE,
mHelper.getNotificationChannel(PKG_O, UID_O, a.getId(), false).getImportance());
assertEquals(false,
mHelper.getNotificationChannel(PKG_O, UID_O, a.getId(), false).canBubble());
}
@Test @Test
public void testUpdateNotificationChannel_notFixedPermission() { public void testUpdateNotificationChannel_notFixedPermission() {
when(mPermissionHelper.isMigrationEnabled()).thenReturn(true); when(mPermissionHelper.isMigrationEnabled()).thenReturn(true);