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

Commit a31bfe25 authored by Yuri Lin's avatar Yuri Lin
Browse files

Rename getNotificationChannelsBypassingDnd argument to uid 

It said "userId" in NotificationManagerService and PreferencesHelper, but in practice was expecting its input to be a uid based on how it's implemented. It also seems most users were already passing in uids (particularly NotificationBackend).

Bug: 220469720
Test: manual verification of settings page, NMSTest, PreferencesHelperTest
Change-Id: I432bdfc7d2986a0a1111c210fd89671524b3885c
parent 40c3bf89

core/java/android/app/INotificationManager.aidl

+1 −1
Original line number Diff line number Diff line
@@ -116,7 +116,7 @@ interface INotificationManager 
    ParceledListSlice getNotificationChannelGroups(String pkg);

    boolean onlyHasDefaultChannel(String pkg, int uid);

    boolean areChannelsBypassingDnd();

    ParceledListSlice getNotificationChannelsBypassingDnd(String pkg, int userId);

    ParceledListSlice getNotificationChannelsBypassingDnd(String pkg, int uid);

    boolean isPackagePaused(String pkg);

    void deleteNotificationHistoryItem(String pkg, int uid, long postedTime);

    boolean isPermissionFixed(String pkg, int userId);

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

+3 −4
Original line number Diff line number Diff line
@@ -4068,13 +4068,12 @@ public class NotificationManagerService extends SystemService { 














        @Override















        public ParceledListSlice<NotificationChannel> getNotificationChannelsBypassingDnd(













                String pkg, int userId) {













                String pkg, int uid) {















            checkCallerIsSystem();













            if (!areNotificationsEnabledForPackage(pkg,













                    mPackageManagerInternal.getPackageUid(pkg, 0, userId))) {













            if (!areNotificationsEnabledForPackage(pkg, uid)) {















                return ParceledListSlice.emptyList();















            }













            return mPreferencesHelper.getNotificationChannelsBypassingDnd(pkg, userId);













            return mPreferencesHelper.getNotificationChannelsBypassingDnd(pkg, uid);















        }





























        @Override

































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



+3
−3




























Original line number
Diff line number
Diff line








@@ -1669,14 +1669,14 @@ public class PreferencesHelper implements RankingConfig {













    }































    /**













     * Gets all notification channels associated with the given pkg and userId that can bypass dnd













     * Gets all notification channels associated with the given pkg and uid that can bypass dnd















     */















    public ParceledListSlice<NotificationChannel> getNotificationChannelsBypassingDnd(String pkg,













            int userId) {













            int uid) {















        List<NotificationChannel> channels = new ArrayList<>();















        synchronized (mPackagePreferences) {















            final PackagePreferences r = mPackagePreferences.get(













                    packagePreferencesKey(pkg, userId));













                    packagePreferencesKey(pkg, uid));















            if (r != null) {















                for (NotificationChannel channel : r.channels.values()) {















                    if (channelIsLiveLocked(r, channel) && channel.canBypassDnd()) {

































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



+17
−17




























Original line number
Diff line number
Diff line








@@ -1870,46 +1870,46 @@ public class PreferencesHelperTest extends UiServiceTestCase {













    @Test















    public void testGetChannelsBypassingDndCount_noChannelsBypassing() throws Exception {















        assertEquals(0, mHelper.getNotificationChannelsBypassingDnd(PKG_N_MR1,













                USER.getIdentifier()).getList().size());













                UID_N_MR1).getList().size());















    }































    @Test













    public void testGetChannelsBypassingDnd_noChannelsForUserIdBypassing()













    public void testGetChannelsBypassingDnd_noChannelsForUidBypassing()















            throws Exception {













        int user = 9;













        int uid = 222;















        NotificationChannel channel = new NotificationChannel("id", "name",















                NotificationManager.IMPORTANCE_MAX);















        channel.setBypassDnd(true);















        mHelper.createNotificationChannel(PKG_N_MR1, 111, channel, true, true);































        assertEquals(0, mHelper.getNotificationChannelsBypassingDnd(PKG_N_MR1,













                user).getList().size());













                uid).getList().size());















    }































    @Test















    public void testGetChannelsBypassingDndCount_oneChannelBypassing_groupBlocked() {













        int user = USER.getIdentifier();













        int uid = UID_N_MR1;















        NotificationChannelGroup ncg = new NotificationChannelGroup("group1", "name1");















        NotificationChannel channel1 = new NotificationChannel("id1", "name1",















                NotificationManager.IMPORTANCE_MAX);















        channel1.setBypassDnd(true);















        channel1.setGroup(ncg.getId());













        mHelper.createNotificationChannelGroup(PKG_N_MR1, user, ncg,  /* fromTargetApp */ true);













        mHelper.createNotificationChannel(PKG_N_MR1, user, channel1, true, /*has DND access*/ true);













        mHelper.createNotificationChannelGroup(PKG_N_MR1, uid, ncg,  /* fromTargetApp */ true);













        mHelper.createNotificationChannel(PKG_N_MR1, uid, channel1, true, /*has DND access*/ true);































        assertEquals(1, mHelper.getNotificationChannelsBypassingDnd(PKG_N_MR1,













                user).getList().size());













                uid).getList().size());































        // disable group















        ncg.setBlocked(true);













        mHelper.createNotificationChannelGroup(PKG_N_MR1, user, ncg,  /* fromTargetApp */ false);













        mHelper.createNotificationChannelGroup(PKG_N_MR1, uid, ncg,  /* fromTargetApp */ false);















        assertEquals(0, mHelper.getNotificationChannelsBypassingDnd(PKG_N_MR1,













                user).getList().size());













                uid).getList().size());















    }































    @Test















    public void testGetChannelsBypassingDndCount_multipleChannelsBypassing() {













        int user = USER.getIdentifier();













        int uid = UID_N_MR1;















        NotificationChannel channel1 = new NotificationChannel("id1", "name1",















                NotificationManager.IMPORTANCE_MAX);















        NotificationChannel channel2 = new NotificationChannel("id2", "name2",









@@ -1920,22 +1920,22 @@ public class PreferencesHelperTest extends UiServiceTestCase {













        channel2.setBypassDnd(true);















        channel3.setBypassDnd(true);















        // has DND access, so can set bypassDnd attribute













        mHelper.createNotificationChannel(PKG_N_MR1, user, channel1, true, /*has DND access*/ true);













        mHelper.createNotificationChannel(PKG_N_MR1, user, channel2, true, true);













        mHelper.createNotificationChannel(PKG_N_MR1, user, channel3, true, true);













        mHelper.createNotificationChannel(PKG_N_MR1, uid, channel1, true, /*has DND access*/ true);













        mHelper.createNotificationChannel(PKG_N_MR1, uid, channel2, true, true);













        mHelper.createNotificationChannel(PKG_N_MR1, uid, channel3, true, true);















        assertEquals(3, mHelper.getNotificationChannelsBypassingDnd(PKG_N_MR1,













                user).getList().size());













                uid).getList().size());































        // setBypassDnd false for some channels















        channel1.setBypassDnd(false);















        channel2.setBypassDnd(false);















        assertEquals(1, mHelper.getNotificationChannelsBypassingDnd(PKG_N_MR1,













                user).getList().size());













                uid).getList().size());































        // setBypassDnd false for rest of the channels















        channel3.setBypassDnd(false);















        assertEquals(0, mHelper.getNotificationChannelsBypassingDnd(PKG_N_MR1,













                user).getList().size());













                uid).getList().size());















    }































    @Test