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

Commit 95fdfad4 authored by Beverly's avatar Beverly
Browse files

Reset initalization state of notif entries 

When the notifications views are filtered out, reset their initialization
time, so now we can rely on the initialization time to determine whether
the notification was recently shown in the shade.

Fixes: 153885122
Test: atest NotificationRankingManagerTest
Test: manual
  1. post grouped notifications
  2. swipe down notification shade to view notifications
  3. toggle on/off DND and see notifications are not ungrouped when
they're unfiltered

Change-Id: Ib9b45cd13ead51d7df2484e91d159cd268799e9a
parent effc2bdd

packages/SystemUI/src/com/android/systemui/statusbar/NotificationViewHierarchyManager.java

+1 −2
Original line number Diff line number Diff line
@@ -186,8 +186,7 @@ public class NotificationViewHierarchyManager implements DynamicPrivacyControlle 


            boolean groupChangesAllowed =

                    mVisualStabilityManager.areGroupChangesAllowed() // user isn't looking at notifs

                    || !ent.hasFinishedInitialization() // notif recently added

                    || !mListContainer.containsView(ent.getRow()); // notif recently unfiltered

                    || !ent.hasFinishedInitialization(); // notif recently added



            NotificationEntry parent = mGroupManager.getGroupSummary(ent.getSbn());

            if (!groupChangesAllowed) {

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

+8 −2
Original line number Diff line number Diff line
@@ -151,6 +151,8 @@ public final class NotificationEntry extends ListEntry { 
    public CharSequence headsUpStatusBarText;

    public CharSequence headsUpStatusBarTextPublic;



    // indicates when this entry's view was first attached to a window

    // this value will reset when the view is completely removed from the shade (ie: filtered out)

    private long initializationTime = -1;



    /**
@@ -473,8 +475,8 @@ public final class NotificationEntry extends ListEntry { 
    }



    public boolean hasFinishedInitialization() {

        return initializationTime == -1

                || SystemClock.elapsedRealtime() > initializationTime + INITIALIZATION_DELAY;

        return initializationTime != -1

                && SystemClock.elapsedRealtime() > initializationTime + INITIALIZATION_DELAY;

    }



    public int getContrastedColor(Context context, boolean isLowPriority,
@@ -565,6 +567,10 @@ public final class NotificationEntry extends ListEntry { 
        return false;

    }



    public void resetInitializationTime() {

        initializationTime = -1;

    }



    public void setInitializationTime(long time) {

        if (initializationTime == -1) {

            initializationTime = time;

packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/NotificationRankingManager.kt

+10 −1
Original line number Diff line number Diff line
@@ -134,13 +134,22 @@ open class NotificationRankingManager @Inject constructor( 
    ): List<NotificationEntry> {

        logger.logFilterAndSort(reason)

        val filtered = entries.asSequence()

                .filterNot(notifFilter::shouldFilterOut)

                .filterNot(this::filter)

                .sortedWith(rankingComparator)

                .toList()

        entries.forEach { it.bucket = getBucketForEntry(it) }

        return filtered

    }



    private fun filter(entry: NotificationEntry): Boolean {

        val filtered = notifFilter.shouldFilterOut(entry)

        if (filtered) {

            // notification is removed from the list, so we reset its initialization time

            entry.resetInitializationTime()

        }

        return filtered

    }



    @PriorityBucket

    private fun getBucketForEntry(entry: NotificationEntry): Int {

        val isHeadsUp = entry.isRowHeadsUp

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

+4 −0
Original line number Diff line number Diff line
@@ -713,6 +713,10 @@ public class ShadeListBuilder implements Dumpable { 
    private boolean applyFilters(NotificationEntry entry, long now, List<NotifFilter> filters) {

        final NotifFilter filter = findRejectingFilter(entry, now, filters);

        entry.getAttachState().setExcludingFilter(filter);

        if (filter != null) {

            // notification is removed from the list, so we reset its initialization time

            entry.resetInitializationTime();

        }

        return filter != null;

    }

packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/NotificationRankingManagerTest.kt

+30 −1
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ import android.app.NotificationChannel 
import android.app.NotificationManager.IMPORTANCE_DEFAULT

import android.app.NotificationManager.IMPORTANCE_HIGH

import android.app.NotificationManager.IMPORTANCE_LOW

import android.os.SystemClock

import android.service.notification.NotificationListenerService.RankingMap

import android.testing.AndroidTestingRunner

import androidx.test.filters.SmallTest
@@ -58,17 +59,19 @@ class NotificationRankingManagerTest : SysuiTestCase() { 
    private lateinit var personNotificationIdentifier: PeopleNotificationIdentifier

    private lateinit var rankingManager: TestableNotificationRankingManager

    private lateinit var sectionsManager: NotificationSectionsFeatureManager

    private lateinit var notificationFilter: NotificationFilter



    @Before

    fun setup() {

        personNotificationIdentifier =

                mock(PeopleNotificationIdentifier::class.java)

        sectionsManager = mock(NotificationSectionsFeatureManager::class.java)

        notificationFilter = mock(NotificationFilter::class.java)

        rankingManager = TestableNotificationRankingManager(

                lazyMedia,

                mock(NotificationGroupManager::class.java),

                mock(HeadsUpManager::class.java),

                mock(NotificationFilter::class.java),

                notificationFilter,

                mock(NotificationEntryManagerLogger::class.java),

                sectionsManager,

                personNotificationIdentifier,
@@ -324,6 +327,32 @@ class NotificationRankingManagerTest : SysuiTestCase() { 
        assertEquals(e.bucket, BUCKET_SILENT)

    }



    @Test

    fun testFilter_resetsInitalizationTime() {

        // GIVEN an entry that was initialized 1 second ago

        val notif = Notification.Builder(mContext, "test") .build()



        val e = NotificationEntryBuilder()

            .setPkg("pkg")

            .setOpPkg("pkg")

            .setTag("tag")

            .setNotification(notif)

            .setUser(mContext.user)

            .setChannel(NotificationChannel("test", "", IMPORTANCE_DEFAULT))

            .setOverrideGroupKey("")

            .build()



        e.setInitializationTime(SystemClock.elapsedRealtime() - 1000)

        assertEquals(true, e.hasFinishedInitialization())



        // WHEN we update ranking and filter out the notification entry

        whenever(notificationFilter.shouldFilterOut(e)).thenReturn(true)

        rankingManager.updateRanking(RankingMap(arrayOf(e.ranking)), listOf(e), "test")



        // THEN the initialization time for the entry is reset

        assertEquals(false, e.hasFinishedInitialization())

    }



    internal class TestableNotificationRankingManager(

        mediaManager: Lazy<NotificationMediaManager>,

        groupManager: NotificationGroupManager,