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

Commit ec5dc5dc authored by Steve Elliott's avatar Steve Elliott
Browse files

Remove PipelineEntry.getRepresentativeEntry() 

Bug: 399736937
Test: make
Test: atest SystemUITests
Flag: com.android.systemui.notification_bundle_ui
Change-Id: Ia63bf06de9e261b61395aa37b297cbe5df2b2eee
parent 90e30314

packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/collection/coordinator/VisualStabilityCoordinatorTest.kt

+2 −0
Original line number Diff line number Diff line
@@ -782,6 +782,7 @@ class VisualStabilityCoordinatorTest(flags: FlagsParameterization) : SysuiTestCa 
            whenever(nonHeadsUpGroupSummary.key).thenReturn("non_heads_up_group_key")

            whenever(nonHeadsUpGroupSummary.isSummaryWithChildren).thenReturn(true)

            val nonHeadsUpGroupEntry: GroupEntry = mock()

            whenever(nonHeadsUpGroupEntry.asListEntry()).thenReturn(nonHeadsUpGroupEntry)

            whenever(nonHeadsUpGroupEntry.summary).thenReturn(nonHeadsUpGroupSummary)

            whenever(nonHeadsUpGroupEntry.representativeEntry).thenReturn(nonHeadsUpGroupSummary)
@@ -880,6 +881,7 @@ class VisualStabilityCoordinatorTest(flags: FlagsParameterization) : SysuiTestCa 
            whenever(groupSummary.isSummaryWithChildren).thenReturn(true)



            val nonHeadsUpGroupEntry: GroupEntry = mock()

            whenever(nonHeadsUpGroupEntry.asListEntry()).thenReturn(nonHeadsUpGroupEntry)

            whenever(nonHeadsUpGroupEntry.summary).thenReturn(groupSummary)

            whenever(nonHeadsUpGroupEntry.representativeEntry).thenReturn(groupSummary)

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

+1 −2
Original line number Diff line number Diff line
@@ -51,8 +51,7 @@ class BundleEntry(spec: BundleSpec) : PipelineEntry(spec.key) { 
        _children.clear()

    }



    /** @return Null because bundles do not have an associated NotificationEntry. */

    override fun getRepresentativeEntry(): NotificationEntry? {

    override fun asListEntry(): ListEntry? {

        return null

    }

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

+5 −2
Original line number Diff line number Diff line
@@ -119,12 +119,15 @@ public class ListDumper { 
                .append(index.length() == 1 ? " " : "")

                .append(logKey(entry));



        final ListEntry listEntry = entry.asListEntry();

        final NotificationEntry notifEntry =

                listEntry == null ? null : listEntry.getRepresentativeEntry();



        if (includeParent) {

            sb.append(" (parent=")

                    .append(logKey(entry.getParent()))

                    .append(")");



            NotificationEntry notifEntry = entry.getRepresentativeEntry();

            if (notifEntry != null) {

                sb.append(" rank=")

                        .append(notifEntry.getRanking().getRank());
@@ -137,7 +140,7 @@ public class ListDumper { 
        }



        if (includeRecordKeeping) {

            NotificationEntry notifEntry = requireNonNull(entry.getRepresentativeEntry());

            requireNonNull(notifEntry);

            StringBuilder rksb = new StringBuilder();



            if (!notifEntry.mLifetimeExtenders.isEmpty()) {

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

+5 −0
Original line number Diff line number Diff line
@@ -54,6 +54,11 @@ public abstract class ListEntry extends PipelineEntry { 
     */

    public abstract @Nullable NotificationEntry getRepresentativeEntry();



    @Override

    public final ListEntry asListEntry() {

        return this;

    }



    @Nullable public PipelineEntry getParent() {

        return mAttachState.getParent();

    }

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

+2 −5
Original line number Diff line number Diff line
@@ -51,12 +51,9 @@ public abstract class PipelineEntry { 
    }



    /**

     * @return The representative NotificationEntry:

     *      for NotificationEntry, return itself

     *      for GroupEntry, return the summary NotificationEntry, or null if it does not exist

     *      for BundleEntry, return null

     * @return This {@link PipelineEntry} as a {@link ListEntry}, or {@code null}.

     */

    public abstract @Nullable NotificationEntry getRepresentativeEntry();

    public abstract @Nullable ListEntry asListEntry();



    /**

     * @return NotifSection that ShadeListBuilder assigned to this PipelineEntry.