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

Commit 1afd718f authored by Jason Lee's avatar Jason Lee Committed by Android (Google) Code Review
Browse files

Merge "Revert "Prevent apps from creating blocked channel groups""

parents 1c671ce1 3d04700c

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

+0 −3
Original line number Diff line number Diff line
@@ -848,9 +848,6 @@ public class PreferencesHelper implements RankingConfig { 
            if (r == null) {

                throw new IllegalArgumentException("Invalid package");

            }

            if (fromTargetApp) {

                group.setBlocked(false);

            }

            final NotificationChannelGroup oldGroup = r.groups.get(group.getId());

            if (oldGroup != null) {

                group.setChannels(oldGroup.getChannels());

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

+1 −14
Original line number Diff line number Diff line
@@ -3173,19 +3173,6 @@ public class PreferencesHelperTest extends UiServiceTestCase { 
        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

    public void testIsGroup_appCannotResetBlock() throws Exception {

        NotificationChannelGroup group = new NotificationChannelGroup("id", "name");
@@ -4719,7 +4706,7 @@ public class PreferencesHelperTest extends UiServiceTestCase { 
    public void testGetConversations_noDisabledGroups() {

        NotificationChannelGroup group = new NotificationChannelGroup("a", "a");

        group.setBlocked(true);

        mHelper.createNotificationChannelGroup(PKG_O, UID_O, group, false);

        mHelper.createNotificationChannelGroup(PKG_O, UID_O, group, true);

        NotificationChannel parent = new NotificationChannel("parent", "p", 1);

        mHelper.createNotificationChannel(PKG_O, UID_O, parent, true, false);