Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 58a42a7c authored by Julia Reynolds's avatar Julia Reynolds Committed by Automerger Merge Worker
Browse files

Merge "Allow users to block notification channels" into tm-dev am: 73871cad am: bc531d34 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18077003



Change-Id: I663088087907e194a263e6bec716ffe3be0ce989
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c1d06f2f bc531d34

services/core/java/com/android/server/notification/PreferencesHelper.java

+2 −1
Original line number Diff line number Diff line
@@ -1116,7 +1116,8 @@ public class PreferencesHelper implements RankingConfig { 
            }



            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());

                }

            } else {

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

+39 −0
Original line number Diff line number Diff line
@@ -4015,6 +4015,45 @@ public class PreferencesHelperTest extends UiServiceTestCase { 
                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

    public void testUpdateNotificationChannel_notFixedPermission() {

        when(mPermissionHelper.isMigrationEnabled()).thenReturn(true);