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

Commit 17717f5a authored by Julia Reynolds's avatar Julia Reynolds
Browse files

Show misc channel with pre-upgrade fields 

- for apps that don't target O but use channges

- Rename misc channel if it already exists
- Add method so settings can tell if it needs to show legacy config

Bug: 38120923
Test: runtest systemui-notification
Change-Id: I5c7c077321f1792851b003b9d9e42505dddd50f0
parent 6c34dd58

core/java/android/app/INotificationManager.aidl

+1 −0
Original line number Diff line number Diff line
@@ -71,6 +71,7 @@ interface INotificationManager 
    int getDeletedChannelCount(String pkg, int uid);

    void deleteNotificationChannelGroup(String pkg, String channelGroupId);

    ParceledListSlice getNotificationChannelGroups(String pkg);

    boolean onlyHasDefaultChannel(String pkg, int uid);



    // TODO: Remove this when callers have been migrated to the equivalent

    // INotificationListener method.

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

+6 −0
Original line number Diff line number Diff line
@@ -1817,6 +1817,12 @@ public class NotificationManagerService extends SystemService { 
                    .getList().size();

        }



        @Override

        public boolean onlyHasDefaultChannel(String pkg, int uid) {

            enforceSystemOrSystemUI("onlyHasDefaultChannel");

            return mRankingHelper.onlyHasDefaultChannel(pkg, uid);

        }



        @Override

        public int getDeletedChannelCount(String pkg, int uid) {

            enforceSystemOrSystemUI("getDeletedChannelCount");

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

+17 −1
Original line number Diff line number Diff line
@@ -301,7 +301,8 @@ public class RankingHelper implements RankingConfig { 


    private void createDefaultChannelIfNeeded(Record r) throws NameNotFoundException {

        if (r.channels.containsKey(NotificationChannel.DEFAULT_CHANNEL_ID)) {

            // Already exists

            r.channels.get(NotificationChannel.DEFAULT_CHANNEL_ID).setName(

                    mContext.getString(R.string.default_notification_channel_label));

            return;

        }
@@ -770,6 +771,21 @@ public class RankingHelper implements RankingConfig { 
        return new ParceledListSlice<>(channels);

    }



    /**

     * True for pre-O apps that only have the default channel, or pre O apps that have no

     * channels yet. This method will create the default channel for pre-O apps that don't have it.

     * Should never be true for O+ targeting apps, but that's enforced on boot/when an app

     * upgrades.

     */

    public boolean onlyHasDefaultChannel(String pkg, int uid) {

        Record r = getOrCreateRecord(pkg, uid);

        if (r.channels.size() == 1

                && r.channels.containsKey(NotificationChannel.DEFAULT_CHANNEL_ID)) {

            return true;

        }

        return false;

    }



    public int getDeletedChannelCount(String pkg, int uid) {

        Preconditions.checkNotNull(pkg);

        int deletedCount = 0;

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

+9 −0
Original line number Diff line number Diff line
@@ -753,6 +753,15 @@ public class RankingHelperTest { 
                mHelper.getNotificationChannel(PKG, UID, newChannel.getId(), false));

    }



    @Test

    public void testOnlyHasDefaultChannel() throws Exception {

        assertTrue(mHelper.onlyHasDefaultChannel(PKG, UID));

        assertFalse(mHelper.onlyHasDefaultChannel(UPDATED_PKG, UID2));



        mHelper.createNotificationChannel(PKG, UID, getChannel(), true);

        assertFalse(mHelper.onlyHasDefaultChannel(PKG, UID));

    }



    @Test

    public void testCreateChannel_defaultChannelId() throws Exception {

        try {