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

Commit 71205b13 authored by Anna Zappone's avatar Anna Zappone Committed by Android (Google) Code Review
Browse files

Merge "Fill Status data in ConversationChannel" into sc-dev

parents 772cd367 5e0e2cbe

services/people/java/com/android/server/people/data/DataManager.java

+6 −1
Original line number Diff line number Diff line
@@ -264,7 +264,8 @@ public class DataManager { 
        return new ConversationChannel(shortcutInfo, uid, parentChannel,

                parentChannelGroup,

                conversationInfo.getLastEventTimestamp(),

                hasActiveNotifications(packageName, userId, shortcutId));

                hasActiveNotifications(packageName, userId, shortcutId), false,

                getStatuses(conversationInfo));

    }



    /** Returns the cached non-customized recent conversations. */
@@ -404,6 +405,10 @@ public class DataManager { 
            String conversationId) {

        ConversationStore cs = getConversationStoreOrThrow(packageName, userId);

        ConversationInfo conversationInfo = getConversationInfoOrThrow(cs, conversationId);

        return getStatuses(conversationInfo);

    }



    private @NonNull List<ConversationStatus> getStatuses(ConversationInfo conversationInfo) {

        Collection<ConversationStatus> statuses = conversationInfo.getStatuses();

        if (statuses != null) {

            final ArrayList<ConversationStatus> list = new ArrayList<>(statuses.size());

services/tests/servicestests/src/com/android/server/people/data/DataManagerTest.java

+10 −3
Original line number Diff line number Diff line
@@ -535,8 +535,11 @@ public final class DataManagerTest { 
        listenerService.onNotificationChannelModified(TEST_PKG_NAME, UserHandle.of(USER_ID_PRIMARY),

                mNotificationChannel, NOTIFICATION_CHANNEL_OR_GROUP_UPDATED);



        assertThat(mDataManager.getConversation(TEST_PKG_NAME, USER_ID_PRIMARY,

                TEST_SHORTCUT_ID)).isNotNull();

        ConversationChannel result = mDataManager.getConversation(TEST_PKG_NAME, USER_ID_PRIMARY,

                TEST_SHORTCUT_ID);

        assertThat(result).isNotNull();

        assertThat(result.hasBirthdayToday()).isFalse();

        assertThat(result.getStatuses()).isEmpty();

    }



    @Test
@@ -557,6 +560,8 @@ public final class DataManagerTest { 
        NotificationListenerService listenerService =

                mDataManager.getNotificationListenerServiceForTesting(USER_ID_PRIMARY);

        listenerService.onNotificationPosted(mStatusBarNotification);

        ConversationStatus cs = new ConversationStatus.Builder("id", ACTIVITY_ANNIVERSARY).build();

        mDataManager.addOrUpdateStatus(TEST_PKG_NAME, USER_ID_PRIMARY, TEST_SHORTCUT_ID, cs);



        ConversationChannel result = mDataManager.getConversation(TEST_PKG_NAME, USER_ID_PRIMARY,

                TEST_SHORTCUT_ID);
@@ -568,6 +573,8 @@ public final class DataManagerTest { 
                result.getParentNotificationChannel().getId());

        assertEquals(mStatusBarNotification.getPostTime(), result.getLastEventTimestamp());

        assertTrue(result.hasActiveNotifications());

        assertFalse(result.hasBirthdayToday());

        assertThat(result.getStatuses()).containsExactly(cs);

    }



    @Test