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

Commit b2637221 authored by Julia Reynolds's avatar Julia Reynolds
Browse files

FGS notifs are no longer upranked 

With the relaxation of FGS visiblity rules in S, we
no longer need to boost FGS notifications to the
alerting section to ensure visibility on the lockscreen.

Test: atest HighPriorirtProviderTest
Bug: 182164793
Change-Id: I363c16708ab00bb3b2c4e3663bac2a6470a75274
parent 348edec2

packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/provider/HighPriorityProvider.java

+1 −7
Original line number Diff line number Diff line
@@ -99,17 +99,11 @@ public class HighPriorityProvider { 


    private boolean hasHighPriorityCharacteristics(NotificationEntry entry) {

        return !hasUserSetImportance(entry)

                && (isImportantOngoing(entry)

                || entry.getSbn().getNotification().hasMediaSession()

                && (entry.getSbn().getNotification().hasMediaSession()

                || isPeopleNotification(entry)

                || isMessagingStyle(entry));

    }



    private boolean isImportantOngoing(NotificationEntry entry) {

        return entry.getSbn().getNotification().isForegroundService()

                && entry.getRanking().getImportance() >= NotificationManager.IMPORTANCE_LOW;

    }



    private boolean isMessagingStyle(NotificationEntry entry) {

        return Notification.MessagingStyle.class.equals(

                entry.getSbn().getNotification().getNotificationStyle());

packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/HighPriorityProviderTest.java

+1 −20
Original line number Diff line number Diff line
@@ -127,25 +127,7 @@ public class HighPriorityProviderTest extends SysuiTestCase { 
                .getPeopleNotificationType(entry))

                .thenReturn(TYPE_NON_PERSON);



        // THEN it has high priority

        assertTrue(mHighPriorityProvider.isHighPriority(entry));

    }



    @Test

    public void minImportanceForeground() {

        // GIVEN notification is low importance and is associated with a foreground service

        final Notification notification = mock(Notification.class);

        when(notification.isForegroundService()).thenReturn(true);



        final NotificationEntry entry = new NotificationEntryBuilder()

                .setNotification(notification)

                .setImportance(IMPORTANCE_MIN)

                .build();

        when(mPeopleNotificationIdentifier

                .getPeopleNotificationType(entry))

                .thenReturn(TYPE_NON_PERSON);



        // THEN it does NOT have high priority

        // THEN it has low priority

        assertFalse(mHighPriorityProvider.isHighPriority(entry));

    }
@@ -155,7 +137,6 @@ public class HighPriorityProviderTest extends SysuiTestCase { 
        // to less than IMPORTANCE_DEFAULT (ie: IMPORTANCE_LOW or IMPORTANCE_MIN)

        final Notification notification = new Notification.Builder(mContext, "test")

                .setStyle(new Notification.MessagingStyle(""))

                .setFlag(Notification.FLAG_FOREGROUND_SERVICE, true)

                .build();

        final NotificationChannel channel = new NotificationChannel("a", "a",

                IMPORTANCE_LOW);