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

Commit 07532c3f authored by Geoffrey Pitsch's avatar Geoffrey Pitsch
Browse files

Allow apps to downgrade importance in createNotificationChannel 

Only takes effect if the user has not changed any fields.
Some tangential cleanup of the test file:
 - Rename member variable "uid" to "mUid"
 - Use correct PKG instead of "test_pkg"
 - Some character limit fixes

Test: runtest systemui-notification
Fixes: 63755460
Change-Id: I3c2df0c03ec333f320ac7a0fe90792f1b0ef02ce
parent 7f0c9be1

core/java/android/app/NotificationManager.java

+5 −1
Original line number Diff line number Diff line
@@ -416,12 +416,16 @@ public class NotificationManager { 
     * Creates a notification channel that notifications can be posted to.

     *

     * This can also be used to restore a deleted channel and to update an existing channel's

     * name and description.

     * name, description, and/or importance.

     *

     * <p>The name and description should only be changed if the locale changes

     * or in response to the user renaming this channel. For example, if a user has a channel

     * named 'John Doe' that represents messages from a 'John Doe', and 'John Doe' changes his name

     * to 'John Smith,' the channel can be renamed to match.

     *

     * <p>The importance of an existing channel will only be changed if the new importance is lower

     * than the current value and the user has not altered any settings on this channel.

     *

     * All other fields are ignored for channels that already exist.

     *

     * @param channel  the channel to create.  Note that the created channel may differ from this

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

+7 −0
Original line number Diff line number Diff line
@@ -546,6 +546,13 @@ public class RankingHelper implements RankingConfig { 
            existing.setDescription(channel.getDescription());

            existing.setBlockableSystem(channel.isBlockableSystem());



            // Apps are allowed to downgrade channel importance if the user has not changed any

            // fields on this channel yet.

            if (existing.getUserLockedFields() == 0 &&

                    channel.getImportance() < existing.getImportance()) {

                existing.setImportance(channel.getImportance());

            }



            updateConfig();

            return;

        }

services/tests/notification/src/com/android/server/notification/NotificationManagerServiceTest.java

+88 −45
Original line number Diff line number Diff line
@@ -102,7 +102,7 @@ import java.util.Map; 
@RunWithLooper

public class NotificationManagerServiceTest extends NotificationTestCase {

    private static final String TEST_CHANNEL_ID = "NotificationManagerServiceTestChannelId";

    private final int uid = Binder.getCallingUid();

    private final int mUid = Binder.getCallingUid();

    private NotificationManagerService mNotificationManagerService;

    private INotificationManager mBinderService;

    private NotificationManagerInternal mInternalService;
@@ -164,7 +164,7 @@ public class NotificationManagerServiceTest extends NotificationTestCase { 
        // most tests assume badging is enabled

        Secure.putIntForUser(getContext().getContentResolver(),

                Secure.NOTIFICATION_BADGING, 1,

                UserHandle.getUserHandleForUid(uid).getIdentifier());

                UserHandle.getUserHandleForUid(mUid).getIdentifier());



        mNotificationManagerService = new TestableNotificationManagerService(mContext);
@@ -173,7 +173,7 @@ public class NotificationManagerServiceTest extends NotificationTestCase { 
        mHandler = mNotificationManagerService.new WorkerHandler(mTestableLooper.getLooper());

        // MockPackageManager - default returns ApplicationInfo with matching calling UID

        final ApplicationInfo applicationInfo = new ApplicationInfo();

        applicationInfo.uid = uid;

        applicationInfo.uid = mUid;

        when(mPackageManager.getApplicationInfo(anyString(), anyInt(), anyInt()))

                .thenReturn(applicationInfo);

        when(mPackageManagerClient.getApplicationInfoAsUser(anyString(), anyInt(), anyInt()))
@@ -188,7 +188,7 @@ public class NotificationManagerServiceTest extends NotificationTestCase { 
        when(mPolicyFile.startWrite()).thenReturn(new FileOutputStream(mFile));



        mListener = mNotificationListeners.new ManagedServiceInfo(

                null, new ComponentName(PKG, "test_class"), uid, true, null, 0);

                null, new ComponentName(PKG, "test_class"), mUid, true, null, 0);

        when(mNotificationListeners.checkServiceTokenLocked(any())).thenReturn(mListener);

        try {

            mNotificationManagerService.init(mTestableLooper.getLooper(),
@@ -228,8 +228,8 @@ public class NotificationManagerServiceTest extends NotificationTestCase { 
                .setGroup(groupKey)

                .setGroupSummary(isSummary);



        StatusBarNotification sbn = new StatusBarNotification(PKG, PKG, id, "tag", uid, 0,

                nb.build(), new UserHandle(uid), null, 0);

        StatusBarNotification sbn = new StatusBarNotification(PKG, PKG, id, "tag", mUid, 0,

                nb.build(), new UserHandle(mUid), null, 0);

        return new NotificationRecord(mContext, sbn, channel);

    }

    private NotificationRecord generateNotificationRecord(NotificationChannel channel) {
@@ -247,8 +247,8 @@ public class NotificationManagerServiceTest extends NotificationTestCase { 
        if (extender != null) {

            nb.extend(extender);

        }

        StatusBarNotification sbn = new StatusBarNotification(PKG, PKG, 1, "tag", uid, 0,

                nb.build(), new UserHandle(uid), null, 0);

        StatusBarNotification sbn = new StatusBarNotification(PKG, PKG, 1, "tag", mUid, 0,

                nb.build(), new UserHandle(mUid), null, 0);

        return new NotificationRecord(mContext, sbn, channel);

    }
@@ -293,17 +293,17 @@ public class NotificationManagerServiceTest extends NotificationTestCase { 
    public void testCreateNotificationChannels_SingleChannel() throws Exception {

        final NotificationChannel channel =

                new NotificationChannel("id", "name", NotificationManager.IMPORTANCE_DEFAULT);

        mBinderService.createNotificationChannels("test_pkg",

        mBinderService.createNotificationChannels(PKG,

                new ParceledListSlice(Arrays.asList(channel)));

        final NotificationChannel createdChannel =

                mBinderService.getNotificationChannel("test_pkg", "id");

                mBinderService.getNotificationChannel(PKG, "id");

        assertTrue(createdChannel != null);

    }



    @Test

    public void testCreateNotificationChannels_NullChannelThrowsException() throws Exception {

        try {

            mBinderService.createNotificationChannels("test_pkg",

            mBinderService.createNotificationChannels(PKG,

                    new ParceledListSlice(Arrays.asList(null)));

            fail("Exception should be thrown immediately.");

        } catch (NullPointerException e) {
@@ -317,10 +317,10 @@ public class NotificationManagerServiceTest extends NotificationTestCase { 
                new NotificationChannel("id1", "name", NotificationManager.IMPORTANCE_DEFAULT);

        final NotificationChannel channel2 =

                new NotificationChannel("id2", "name", NotificationManager.IMPORTANCE_DEFAULT);

        mBinderService.createNotificationChannels("test_pkg",

        mBinderService.createNotificationChannels(PKG,

                new ParceledListSlice(Arrays.asList(channel1, channel2)));

        assertTrue(mBinderService.getNotificationChannel("test_pkg", "id1") != null);

        assertTrue(mBinderService.getNotificationChannel("test_pkg", "id2") != null);

        assertTrue(mBinderService.getNotificationChannel(PKG, "id1") != null);

        assertTrue(mBinderService.getNotificationChannel(PKG, "id2") != null);

    }



    @Test
@@ -328,19 +328,60 @@ public class NotificationManagerServiceTest extends NotificationTestCase { 
            throws Exception {

        final NotificationChannel channel =

                new NotificationChannel("id", "name", NotificationManager.IMPORTANCE_DEFAULT);

        mBinderService.createNotificationChannels("test_pkg",

        mBinderService.createNotificationChannels(PKG,

                new ParceledListSlice(Arrays.asList(channel)));



        // Recreating the channel doesn't throw, but ignores importance.

        final NotificationChannel dupeChannel =

                new NotificationChannel("id", "name", NotificationManager.IMPORTANCE_HIGH);

        mBinderService.createNotificationChannels("test_pkg",

        mBinderService.createNotificationChannels(PKG,

                new ParceledListSlice(Arrays.asList(dupeChannel)));

        final NotificationChannel createdChannel =

                mBinderService.getNotificationChannel("test_pkg", "id");

                mBinderService.getNotificationChannel(PKG, "id");

        assertEquals(NotificationManager.IMPORTANCE_DEFAULT, createdChannel.getImportance());

    }



    @Test

    public void testCreateNotificationChannels_SecondCreateAllowedToDowngradeImportance()

            throws Exception {

        final NotificationChannel channel =

                new NotificationChannel("id", "name", NotificationManager.IMPORTANCE_DEFAULT);

        mBinderService.createNotificationChannels(PKG,

                new ParceledListSlice(Arrays.asList(channel)));



        // Recreating with a lower importance is allowed to modify the channel.

        final NotificationChannel dupeChannel =

                new NotificationChannel("id", "name", NotificationManager.IMPORTANCE_LOW);

        mBinderService.createNotificationChannels(PKG,

                new ParceledListSlice(Arrays.asList(dupeChannel)));

        final NotificationChannel createdChannel =

                mBinderService.getNotificationChannel(PKG, "id");

        assertEquals(NotificationManager.IMPORTANCE_LOW, createdChannel.getImportance());

    }



    @Test

    public void testCreateNotificationChannels_CannotDowngradeImportanceIfAlreadyUpdated()

            throws Exception {

        final NotificationChannel channel =

                new NotificationChannel("id", "name", NotificationManager.IMPORTANCE_DEFAULT);

        mBinderService.createNotificationChannels(PKG,

                new ParceledListSlice(Arrays.asList(channel)));



        // The user modifies importance directly, can no longer be changed by the app.

        final NotificationChannel updatedChannel =

                new NotificationChannel("id", "name", NotificationManager.IMPORTANCE_HIGH);

        mBinderService.updateNotificationChannelForPackage(PKG, mUid, updatedChannel);



        // Recreating with a lower importance leaves channel unchanged.

        final NotificationChannel dupeChannel =

                new NotificationChannel("id", "name", NotificationManager.IMPORTANCE_LOW);

        mBinderService.createNotificationChannels(PKG,

                new ParceledListSlice(Arrays.asList(dupeChannel)));

        final NotificationChannel createdChannel =

                mBinderService.getNotificationChannel(PKG, "id");

        assertEquals(NotificationManager.IMPORTANCE_HIGH, createdChannel.getImportance());

    }



    @Test

    public void testCreateNotificationChannels_IdenticalChannelsInListIgnoresSecond()

            throws Exception {
@@ -348,10 +389,10 @@ public class NotificationManagerServiceTest extends NotificationTestCase { 
                new NotificationChannel("id", "name", NotificationManager.IMPORTANCE_DEFAULT);

        final NotificationChannel channel2 =

                new NotificationChannel("id", "name", NotificationManager.IMPORTANCE_HIGH);

        mBinderService.createNotificationChannels("test_pkg",

        mBinderService.createNotificationChannels(PKG,

                new ParceledListSlice(Arrays.asList(channel1, channel2)));

        final NotificationChannel createdChannel =

                mBinderService.getNotificationChannel("test_pkg", "id");

                mBinderService.getNotificationChannel(PKG, "id");

        assertEquals(NotificationManager.IMPORTANCE_DEFAULT, createdChannel.getImportance());

    }
@@ -382,7 +423,7 @@ public class NotificationManagerServiceTest extends NotificationTestCase { 
    public void testEnqueuedBlockedNotifications_blockedApp() throws Exception {

        when(mPackageManager.isPackageSuspendedForUser(anyString(), anyInt())).thenReturn(false);



        mBinderService.setNotificationsEnabledForPackage(PKG, uid, false);

        mBinderService.setNotificationsEnabledForPackage(PKG, mUid, false);



        final StatusBarNotification sbn = generateNotificationRecord(null).sbn;

        mBinderService.enqueueNotificationWithTag(PKG, "opPkg", "tag",
@@ -463,7 +504,7 @@ public class NotificationManagerServiceTest extends NotificationTestCase { 
                n.sbn.getId(), n.sbn.getNotification(), n.sbn.getUserId());

        waitForIdle();



        mNotificationManagerService.mNotificationDelegate.onClearAll(uid, Binder.getCallingPid(),

        mNotificationManagerService.mNotificationDelegate.onClearAll(mUid, Binder.getCallingPid(),

                n.getUserId());

        waitForIdle();

        StatusBarNotification[] notifs =
@@ -605,7 +646,7 @@ public class NotificationManagerServiceTest extends NotificationTestCase { 
                mTestNotificationChannel, 1, "group", true);

        notif.getNotification().flags |= Notification.FLAG_NO_CLEAR;

        mNotificationManagerService.addNotification(notif);

        mNotificationManagerService.cancelAllNotificationsInt(uid, 0, PKG, null, 0, 0, true,

        mNotificationManagerService.cancelAllNotificationsInt(mUid, 0, PKG, null, 0, 0, true,

                notif.getUserId(), 0, null);

        waitForIdle();

        StatusBarNotification[] notifs =
@@ -620,7 +661,7 @@ public class NotificationManagerServiceTest extends NotificationTestCase { 
        notif.getNotification().flags |= Notification.FLAG_NO_CLEAR;

        mNotificationManagerService.addNotification(notif);



        mNotificationManagerService.mNotificationDelegate.onClearAll(uid, Binder.getCallingPid(),

        mNotificationManagerService.mNotificationDelegate.onClearAll(mUid, Binder.getCallingPid(),

                notif.getUserId());

        waitForIdle();

        StatusBarNotification[] notifs =
@@ -665,7 +706,7 @@ public class NotificationManagerServiceTest extends NotificationTestCase { 
        mNotificationManagerService.addNotification(child);

        mNotificationManagerService.addNotification(child2);

        mNotificationManagerService.addNotification(newGroup);

        mNotificationManagerService.mNotificationDelegate.onClearAll(uid, Binder.getCallingPid(),

        mNotificationManagerService.mNotificationDelegate.onClearAll(mUid, Binder.getCallingPid(),

                parent.getUserId());

        waitForIdle();

        StatusBarNotification[] notifs =
@@ -776,7 +817,7 @@ public class NotificationManagerServiceTest extends NotificationTestCase { 
    public void testCreateChannelNotifyListener() throws Exception {

        List<String> associations = new ArrayList<>();

        associations.add("a");

        when(mCompanionMgr.getAssociations(PKG, uid)).thenReturn(associations);

        when(mCompanionMgr.getAssociations(PKG, mUid)).thenReturn(associations);

        mNotificationManagerService.setRankingHelper(mRankingHelper);

        when(mRankingHelper.getNotificationChannel(eq(PKG), anyInt(),

                eq(mTestNotificationChannel.getId()), anyBoolean()))
@@ -801,7 +842,7 @@ public class NotificationManagerServiceTest extends NotificationTestCase { 
    public void testCreateChannelGroupNotifyListener() throws Exception {

        List<String> associations = new ArrayList<>();

        associations.add("a");

        when(mCompanionMgr.getAssociations(PKG, uid)).thenReturn(associations);

        when(mCompanionMgr.getAssociations(PKG, mUid)).thenReturn(associations);

        mNotificationManagerService.setRankingHelper(mRankingHelper);

        NotificationChannelGroup group1 = new NotificationChannelGroup("a", "b");

        NotificationChannelGroup group2 = new NotificationChannelGroup("n", "m");
@@ -821,7 +862,7 @@ public class NotificationManagerServiceTest extends NotificationTestCase { 
    public void testUpdateChannelNotifyListener() throws Exception {

        List<String> associations = new ArrayList<>();

        associations.add("a");

        when(mCompanionMgr.getAssociations(PKG, uid)).thenReturn(associations);

        when(mCompanionMgr.getAssociations(PKG, mUid)).thenReturn(associations);

        mNotificationManagerService.setRankingHelper(mRankingHelper);

        mTestNotificationChannel.setLightColor(Color.CYAN);

        when(mRankingHelper.getNotificationChannel(eq(PKG), anyInt(),
@@ -839,7 +880,7 @@ public class NotificationManagerServiceTest extends NotificationTestCase { 
    public void testDeleteChannelNotifyListener() throws Exception {

        List<String> associations = new ArrayList<>();

        associations.add("a");

        when(mCompanionMgr.getAssociations(PKG, uid)).thenReturn(associations);

        when(mCompanionMgr.getAssociations(PKG, mUid)).thenReturn(associations);

        mNotificationManagerService.setRankingHelper(mRankingHelper);

        when(mRankingHelper.getNotificationChannel(eq(PKG), anyInt(),

                eq(mTestNotificationChannel.getId()), anyBoolean()))
@@ -855,7 +896,7 @@ public class NotificationManagerServiceTest extends NotificationTestCase { 
    public void testDeleteChannelGroupNotifyListener() throws Exception {

        List<String> associations = new ArrayList<>();

        associations.add("a");

        when(mCompanionMgr.getAssociations(PKG, uid)).thenReturn(associations);

        when(mCompanionMgr.getAssociations(PKG, mUid)).thenReturn(associations);

        NotificationChannelGroup ncg = new NotificationChannelGroup("a", "b/c");

        mNotificationManagerService.setRankingHelper(mRankingHelper);

        when(mRankingHelper.getNotificationChannelGroup(eq(ncg.getId()), eq(PKG), anyInt()))
@@ -872,7 +913,7 @@ public class NotificationManagerServiceTest extends NotificationTestCase { 
        mNotificationManagerService.setRankingHelper(mRankingHelper);

        List<String> associations = new ArrayList<>();

        associations.add("a");

        when(mCompanionMgr.getAssociations(PKG, uid)).thenReturn(associations);

        when(mCompanionMgr.getAssociations(PKG, mUid)).thenReturn(associations);



        mBinderService.updateNotificationChannelFromPrivilegedListener(

                null, PKG, Process.myUserHandle(), mTestNotificationChannel);
@@ -888,7 +929,7 @@ public class NotificationManagerServiceTest extends NotificationTestCase { 
    public void testUpdateNotificationChannelFromPrivilegedListener_noAccess() throws Exception {

        mNotificationManagerService.setRankingHelper(mRankingHelper);

        List<String> associations = new ArrayList<>();

        when(mCompanionMgr.getAssociations(PKG, uid)).thenReturn(associations);

        when(mCompanionMgr.getAssociations(PKG, mUid)).thenReturn(associations);



        try {

            mBinderService.updateNotificationChannelFromPrivilegedListener(
@@ -910,7 +951,7 @@ public class NotificationManagerServiceTest extends NotificationTestCase { 
        mNotificationManagerService.setRankingHelper(mRankingHelper);

        List<String> associations = new ArrayList<>();

        associations.add("a");

        when(mCompanionMgr.getAssociations(PKG, uid)).thenReturn(associations);

        when(mCompanionMgr.getAssociations(PKG, mUid)).thenReturn(associations);

        mListener = mock(ManagedServices.ManagedServiceInfo.class);

        mListener.component = new ComponentName(PKG, PKG);

        when(mListener.enabledAndUserMatches(anyInt())).thenReturn(false);
@@ -936,7 +977,7 @@ public class NotificationManagerServiceTest extends NotificationTestCase { 
        mNotificationManagerService.setRankingHelper(mRankingHelper);

        List<String> associations = new ArrayList<>();

        associations.add("a");

        when(mCompanionMgr.getAssociations(PKG, uid)).thenReturn(associations);

        when(mCompanionMgr.getAssociations(PKG, mUid)).thenReturn(associations);



        mBinderService.getNotificationChannelsFromPrivilegedListener(

                null, PKG, Process.myUserHandle());
@@ -949,7 +990,7 @@ public class NotificationManagerServiceTest extends NotificationTestCase { 
    public void testGetNotificationChannelFromPrivilegedListener_noAccess() throws Exception {

        mNotificationManagerService.setRankingHelper(mRankingHelper);

        List<String> associations = new ArrayList<>();

        when(mCompanionMgr.getAssociations(PKG, uid)).thenReturn(associations);

        when(mCompanionMgr.getAssociations(PKG, mUid)).thenReturn(associations);



        try {

            mBinderService.getNotificationChannelsFromPrivilegedListener(
@@ -968,7 +1009,7 @@ public class NotificationManagerServiceTest extends NotificationTestCase { 
        mNotificationManagerService.setRankingHelper(mRankingHelper);

        List<String> associations = new ArrayList<>();

        associations.add("a");

        when(mCompanionMgr.getAssociations(PKG, uid)).thenReturn(associations);

        when(mCompanionMgr.getAssociations(PKG, mUid)).thenReturn(associations);

        mListener = mock(ManagedServices.ManagedServiceInfo.class);

        when(mListener.enabledAndUserMatches(anyInt())).thenReturn(false);

        when(mNotificationListeners.checkServiceTokenLocked(any())).thenReturn(mListener);
@@ -990,7 +1031,7 @@ public class NotificationManagerServiceTest extends NotificationTestCase { 
        mNotificationManagerService.setRankingHelper(mRankingHelper);

        List<String> associations = new ArrayList<>();

        associations.add("a");

        when(mCompanionMgr.getAssociations(PKG, uid)).thenReturn(associations);

        when(mCompanionMgr.getAssociations(PKG, mUid)).thenReturn(associations);



        mBinderService.getNotificationChannelGroupsFromPrivilegedListener(

                null, PKG, Process.myUserHandle());
@@ -1002,7 +1043,7 @@ public class NotificationManagerServiceTest extends NotificationTestCase { 
    public void testGetNotificationChannelGroupsFromPrivilegedListener_noAccess() throws Exception {

        mNotificationManagerService.setRankingHelper(mRankingHelper);

        List<String> associations = new ArrayList<>();

        when(mCompanionMgr.getAssociations(PKG, uid)).thenReturn(associations);

        when(mCompanionMgr.getAssociations(PKG, mUid)).thenReturn(associations);



        try {

            mBinderService.getNotificationChannelGroupsFromPrivilegedListener(
@@ -1019,7 +1060,7 @@ public class NotificationManagerServiceTest extends NotificationTestCase { 
    public void testGetNotificationChannelGroupsFromPrivilegedListener_badUser() throws Exception {

        mNotificationManagerService.setRankingHelper(mRankingHelper);

        List<String> associations = new ArrayList<>();

        when(mCompanionMgr.getAssociations(PKG, uid)).thenReturn(associations);

        when(mCompanionMgr.getAssociations(PKG, mUid)).thenReturn(associations);

        mListener = mock(ManagedServices.ManagedServiceInfo.class);

        when(mListener.enabledAndUserMatches(anyInt())).thenReturn(false);

        when(mNotificationListeners.checkServiceTokenLocked(any())).thenReturn(mListener);
@@ -1333,8 +1374,8 @@ public class NotificationManagerServiceTest extends NotificationTestCase { 
                .setColorized(true)

                .setFlag(Notification.FLAG_CAN_COLORIZE, true)

                .setSmallIcon(android.R.drawable.sym_def_app_icon);

        StatusBarNotification sbn = new StatusBarNotification(PKG, PKG, 1, "tag", uid, 0,

                nb.build(), new UserHandle(uid), null, 0);

        StatusBarNotification sbn = new StatusBarNotification(PKG, PKG, 1, "tag", mUid, 0,

                nb.build(), new UserHandle(mUid), null, 0);

        NotificationRecord nr = new NotificationRecord(mContext, sbn, mTestNotificationChannel);



        mBinderService.enqueueNotificationWithTag(PKG, PKG, null,
@@ -1350,11 +1391,13 @@ public class NotificationManagerServiceTest extends NotificationTestCase { 
    @Test

    public void testGetNotificationCountLocked() throws Exception {

        for (int i = 0; i < 20; i++) {

            NotificationRecord r = generateNotificationRecord(mTestNotificationChannel, i, null, false);

            NotificationRecord r =

                    generateNotificationRecord(mTestNotificationChannel, i, null, false);

            mNotificationManagerService.addEnqueuedNotification(r);

        }

        for (int i = 0; i < 20; i++) {

            NotificationRecord r = generateNotificationRecord(mTestNotificationChannel, i, null, false);

            NotificationRecord r =

                    generateNotificationRecord(mTestNotificationChannel, i, null, false);

            mNotificationManagerService.addNotification(r);

        }
@@ -1364,15 +1407,15 @@ public class NotificationManagerServiceTest extends NotificationTestCase { 
                .setSmallIcon(android.R.drawable.sym_def_app_icon)

                .build();



        StatusBarNotification sbn = new StatusBarNotification("a", "a", 0, "tag", uid, 0,

                n, new UserHandle(uid), null, 0);

        StatusBarNotification sbn = new StatusBarNotification("a", "a", 0, "tag", mUid, 0,

                n, new UserHandle(mUid), null, 0);

        NotificationRecord otherPackage =

                new NotificationRecord(mContext, sbn, mTestNotificationChannel);

        mNotificationManagerService.addEnqueuedNotification(otherPackage);

        mNotificationManagerService.addNotification(otherPackage);



        // Same notifications are enqueued as posted, everything counts b/c id and tag don't match

        int userId = new UserHandle(uid).getIdentifier();

        int userId = new UserHandle(mUid).getIdentifier();

        assertEquals(40, mNotificationManagerService.getNotificationCountLocked(PKG, userId, 0, null));

        assertEquals(40, mNotificationManagerService.getNotificationCountLocked(PKG, userId, 0, "tag2"));

        assertEquals(2, mNotificationManagerService.getNotificationCountLocked("a", userId, 0, "banana"));