Merge "Revert "Don't filter out groups if summary is re-inflating"" into tm-qpr-dev am: 0e7e625157

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20238823

Change-Id: I670bd7f8a0b2c66299837308aa90a819786f52f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

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

@@ -407,10 +407,7 @@ public class PreparationCoordinator implements Coordinator {
             mLogger.logGroupInflationTookTooLong(group);
             return false;
         }
-        // Only delay release if the summary is not inflated.
+        if (mInflatingNotifs.contains(group.getSummary())) {
-        // TODO(253454977): Once we ensure that all other pipeline filtering and pruning has been
-        //  done by this point, we can revert back to checking for mInflatingNotifs.contains(...)
-        if (!isInflated(group.getSummary())) {
             mLogger.logDelayingGroupRelease(group, group.getSummary());
             return true;
         }

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

@@ -181,7 +181,7 @@ public class PreparationCoordinatorTest extends SysuiTestCase {
     @Test
     public void testInflatesNewNotification() {
         // WHEN there is a new notification
-        mCollectionListener.onEntryInit(mEntry);
+        mCollectionListener.onEntryAdded(mEntry);
         mBeforeFilterListener.onBeforeFinalizeFilter(List.of(mEntry));
 
         // THEN we inflate it
@@ -194,7 +194,7 @@ public class PreparationCoordinatorTest extends SysuiTestCase {
     @Test
     public void testRebindsInflatedNotificationsOnUpdate() {
         // GIVEN an inflated notification
-        mCollectionListener.onEntryInit(mEntry);
+        mCollectionListener.onEntryAdded(mEntry);
         mBeforeFilterListener.onBeforeFinalizeFilter(List.of(mEntry));
         verify(mNotifInflater).inflateViews(eq(mEntry), any(), any());
         mNotifInflater.invokeInflateCallbackForEntry(mEntry);
@@ -213,7 +213,7 @@ public class PreparationCoordinatorTest extends SysuiTestCase {
     @Test
     public void testEntrySmartReplyAdditionWillRebindViews() {
         // GIVEN an inflated notification
-        mCollectionListener.onEntryInit(mEntry);
+        mCollectionListener.onEntryAdded(mEntry);
         mBeforeFilterListener.onBeforeFinalizeFilter(List.of(mEntry));
         verify(mNotifInflater).inflateViews(eq(mEntry), any(), any());
         mNotifInflater.invokeInflateCallbackForEntry(mEntry);
@@ -232,7 +232,7 @@ public class PreparationCoordinatorTest extends SysuiTestCase {
     @Test
     public void testEntryChangedToMinimizedSectionWillRebindViews() {
         // GIVEN an inflated notification
-        mCollectionListener.onEntryInit(mEntry);
+        mCollectionListener.onEntryAdded(mEntry);
         mBeforeFilterListener.onBeforeFinalizeFilter(List.of(mEntry));
         verify(mNotifInflater).inflateViews(eq(mEntry), mParamsCaptor.capture(), any());
         assertFalse(mParamsCaptor.getValue().isLowPriority());
@@ -254,36 +254,28 @@ public class PreparationCoordinatorTest extends SysuiTestCase {
     public void testMinimizedEntryMovedIntoGroupWillRebindViews() {
         // GIVEN an inflated, minimized notification
         setSectionIsLowPriority(true);
-        mCollectionListener.onEntryInit(mEntry);
+        mCollectionListener.onEntryAdded(mEntry);
         mBeforeFilterListener.onBeforeFinalizeFilter(List.of(mEntry));
         verify(mNotifInflater).inflateViews(eq(mEntry), mParamsCaptor.capture(), any());
         assertTrue(mParamsCaptor.getValue().isLowPriority());
         mNotifInflater.invokeInflateCallbackForEntry(mEntry);
 
         // WHEN notification is moved under a parent
-        NotificationEntry groupSummary = getNotificationEntryBuilder()
+        NotificationEntryBuilder.setNewParent(mEntry, mock(GroupEntry.class));
-                .setParent(ROOT_ENTRY)
+        mBeforeFilterListener.onBeforeFinalizeFilter(List.of(mEntry));
-                .setGroupSummary(mContext, true)
-                .setGroup(mContext, TEST_GROUP_KEY)
-                .build();
-        GroupEntry parent = mock(GroupEntry.class);
-        when(parent.getSummary()).thenReturn(groupSummary);
-        NotificationEntryBuilder.setNewParent(mEntry, parent);
-        mCollectionListener.onEntryInit(groupSummary);
-        mBeforeFilterListener.onBeforeFinalizeFilter(List.of(mEntry, groupSummary));
 
         // THEN we rebind it as not-minimized
         verify(mNotifInflater).rebindViews(eq(mEntry), mParamsCaptor.capture(), any());
         assertFalse(mParamsCaptor.getValue().isLowPriority());
 
-        // THEN we filter it because the parent summary is not yet inflated.
+        // THEN we do not filter it because it's not the first inflation.
-        assertTrue(mUninflatedFilter.shouldFilterOut(mEntry, 0));
+        assertFalse(mUninflatedFilter.shouldFilterOut(mEntry, 0));
     }
 
     @Test
     public void testEntryRankChangeWillNotRebindViews() {
         // GIVEN an inflated notification
-        mCollectionListener.onEntryInit(mEntry);
+        mCollectionListener.onEntryAdded(mEntry);
         mBeforeFilterListener.onBeforeFinalizeFilter(List.of(mEntry));
         verify(mNotifInflater).inflateViews(eq(mEntry), any(), any());
         mNotifInflater.invokeInflateCallbackForEntry(mEntry);
@@ -302,7 +294,7 @@ public class PreparationCoordinatorTest extends SysuiTestCase {
     @Test
     public void testDoesntFilterInflatedNotifs() {
         // GIVEN an inflated notification
-        mCollectionListener.onEntryInit(mEntry);
+        mCollectionListener.onEntryAdded(mEntry);
         mBeforeFilterListener.onBeforeFinalizeFilter(List.of(mEntry));
         verify(mNotifInflater).inflateViews(eq(mEntry), any(), any());
         mNotifInflater.invokeInflateCallbackForEntry(mEntry);
@@ -338,9 +330,9 @@ public class PreparationCoordinatorTest extends SysuiTestCase {
             mCollectionListener.onEntryInit(entry);
         }
 
-        mCollectionListener.onEntryInit(summary);
+        mCollectionListener.onEntryAdded(summary);
         for (NotificationEntry entry : children) {
-            mCollectionListener.onEntryInit(entry);
+            mCollectionListener.onEntryAdded(entry);
         }
 
         mBeforeFilterListener.onBeforeFinalizeFilter(List.of(groupEntry));
@@ -400,40 +392,6 @@ public class PreparationCoordinatorTest extends SysuiTestCase {
         assertTrue(mUninflatedFilter.shouldFilterOut(child1, 401));
     }
 
-    @Test
-    public void testPartiallyInflatedGroupsAreNotFilteredOutIfSummaryReinflate() {
-        // GIVEN a newly-posted group with a summary and two children
-        final String groupKey = "test_reinflate_group";
-        final int summaryId = 1;
-        final GroupEntry group = new GroupEntryBuilder()
-                .setKey(groupKey)
-                .setCreationTime(400)
-                .setSummary(getNotificationEntryBuilder().setId(summaryId).setImportance(1).build())
-                .addChild(getNotificationEntryBuilder().setId(2).build())
-                .addChild(getNotificationEntryBuilder().setId(3).build())
-                .build();
-        fireAddEvents(List.of(group));
-        final NotificationEntry summary = group.getSummary();
-        final NotificationEntry child0 = group.getChildren().get(0);
-        final NotificationEntry child1 = group.getChildren().get(1);
-        mBeforeFilterListener.onBeforeFinalizeFilter(List.of(group));
-
-        // WHEN all of the children (but not the summary) finish inflating
-        mNotifInflater.invokeInflateCallbackForEntry(child0);
-        mNotifInflater.invokeInflateCallbackForEntry(child1);
-        mNotifInflater.invokeInflateCallbackForEntry(summary);
-
-        // WHEN the summary is updated and starts re-inflating
-        summary.setRanking(new RankingBuilder(summary.getRanking()).setImportance(4).build());
-        fireUpdateEvents(summary);
-        mBeforeFilterListener.onBeforeFinalizeFilter(List.of(group));
-
-        // THEN the entire group is still not filtered out
-        assertFalse(mUninflatedFilter.shouldFilterOut(summary, 401));
-        assertFalse(mUninflatedFilter.shouldFilterOut(child0, 401));
-        assertFalse(mUninflatedFilter.shouldFilterOut(child1, 401));
-    }
-
     @Test
     public void testCompletedInflatedGroupsAreReleased() {
         // GIVEN a newly-posted group with a summary and two children
@@ -454,7 +412,7 @@ public class PreparationCoordinatorTest extends SysuiTestCase {
         mNotifInflater.invokeInflateCallbackForEntry(child1);
         mNotifInflater.invokeInflateCallbackForEntry(summary);
 
-        // THEN the entire group is no longer filtered out
+        // THEN the entire group is still filtered out
         assertFalse(mUninflatedFilter.shouldFilterOut(summary, 401));
         assertFalse(mUninflatedFilter.shouldFilterOut(child0, 401));
         assertFalse(mUninflatedFilter.shouldFilterOut(child1, 401));
@@ -536,11 +494,7 @@ public class PreparationCoordinatorTest extends SysuiTestCase {
 
     private void fireAddEvents(NotificationEntry entry) {
         mCollectionListener.onEntryInit(entry);
-        mCollectionListener.onEntryInit(entry);
+        mCollectionListener.onEntryAdded(entry);
-    }
-
-    private void fireUpdateEvents(NotificationEntry entry) {
-        mCollectionListener.onEntryUpdated(entry);
     }
 
     private static final String TEST_MESSAGE = "TEST_MESSAGE";