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

Commit 1cc5f842 authored by Julia Reynolds's avatar Julia Reynolds
Browse files

Fix notification history ordering 

Newest first!

Test: atest
Bug: 137396965
Change-Id: I83f8ddde5e5f929dff2bcafe55e26a51f82f90f5
parent 80cc009b

core/java/android/app/NotificationHistory.java

+15 −1
Original line number Diff line number Diff line
@@ -24,6 +24,8 @@ import android.os.Parcelable; 


import java.util.ArrayList;

import java.util.Arrays;

import java.util.Collections;

import java.util.Comparator;

import java.util.HashSet;

import java.util.List;

import java.util.Objects;
@@ -311,11 +313,23 @@ public final class NotificationHistory implements Parcelable { 
        mHistoryCount++;

    }



    /**

     * Used when populating a history from disk; adds an historical notification.

     */

    public void addNewNotificationToWrite(@NonNull HistoricalNotification notification) {

        if (notification == null) {

            return;

        }

        mNotificationsToWrite.add(0, notification);

        mHistoryCount++;

    }



    public void addNotificationsToWrite(@NonNull NotificationHistory notificationHistory) {

        for (HistoricalNotification hn : notificationHistory.getNotificationsToWrite()) {

            // TODO: consider merging by date

            addNotificationToWrite(hn);

        }

        Collections.sort(mNotificationsToWrite,

                (o1, o2) -> -1 * Long.compare(o1.getPostedTimeMs(), o2.getPostedTimeMs()));

        poolStringsFromNotifications();

    }

core/tests/coretests/src/android/app/NotificationHistoryTest.java

+10 −7
Original line number Diff line number Diff line
@@ -116,25 +116,28 @@ public class NotificationHistoryTest { 
    @Test

    public void testAddNotificationsToWrite() {

        NotificationHistory history = new NotificationHistory();

        HistoricalNotification n = getHistoricalNotification(0);

        HistoricalNotification n = getHistoricalNotification(3);

        HistoricalNotification n2 = getHistoricalNotification(1);

        HistoricalNotification n5 = getHistoricalNotification(0);

        history.addNotificationToWrite(n2);

        history.addNotificationToWrite(n);

        history.addNotificationToWrite(n5);



        NotificationHistory secondHistory = new NotificationHistory();

        HistoricalNotification n3 = getHistoricalNotification(2);

        HistoricalNotification n4 = getHistoricalNotification(3);

        HistoricalNotification n3 = getHistoricalNotification(4);

        HistoricalNotification n4 = getHistoricalNotification(2);

        secondHistory.addNotificationToWrite(n4);

        secondHistory.addNotificationToWrite(n3);



        history.addNotificationsToWrite(secondHistory);



        assertThat(history.getNotificationsToWrite().size()).isEqualTo(4);

        assertThat(history.getNotificationsToWrite().get(0)).isSameAs(n2);

        assertThat(history.getNotificationsToWrite().size()).isEqualTo(5);

        assertThat(history.getNotificationsToWrite().get(0)).isSameAs(n3);

        assertThat(history.getNotificationsToWrite().get(1)).isSameAs(n);

        assertThat(history.getNotificationsToWrite().get(2)).isSameAs(n4);

        assertThat(history.getNotificationsToWrite().get(3)).isSameAs(n3);

        assertThat(history.getHistoryCount()).isEqualTo(4);

        assertThat(history.getNotificationsToWrite().get(3)).isSameAs(n2);

        assertThat(history.getNotificationsToWrite().get(4)).isSameAs(n5);

        assertThat(history.getHistoryCount()).isEqualTo(5);



        assertThat(history.getPooledStringsToWrite()).asList().contains(n2.getChannelName());

        assertThat(history.getPooledStringsToWrite()).asList().contains(n4.getPackage());

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

+1 −1
Original line number Diff line number Diff line
@@ -172,7 +172,7 @@ public class NotificationHistoryDatabase { 


    public void addNotification(final HistoricalNotification notification) {

        synchronized (mLock) {

            mBuffer.addNotificationToWrite(notification);

            mBuffer.addNewNotificationToWrite(notification);

            // Each time we have new history to write to disk, schedule a write in [interval] ms

            if (mBuffer.getHistoryCount() == 1) {

                mFileWriteHandler.postDelayed(mWriteBufferRunnable, WRITE_BUFFER_INTERVAL_MS);

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

+14 −0
Original line number Diff line number Diff line
@@ -185,6 +185,20 @@ public class NotificationHistoryDatabaseTest extends UiServiceTestCase { 
        verify(mFileWriteHandler, times(1)).postDelayed(any(), anyLong());

    }



    @Test

    public void testAddNotification_newestFirst() {

        HistoricalNotification n = getHistoricalNotification(1);

        HistoricalNotification n2 = getHistoricalNotification(2);



        mDataBase.addNotification(n);



        // second add should not trigger another write

        mDataBase.addNotification(n2);



        assertThat(mDataBase.mBuffer.getNotificationsToWrite().get(0)).isEqualTo(n2);

        assertThat(mDataBase.mBuffer.getNotificationsToWrite().get(1)).isEqualTo(n);

    }



    @Test

    public void testReadNotificationHistory_readsAllFiles() throws Exception {

        for (long i = 10; i >= 5; i--) {