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

Commit 3c421b48 authored by Steve Elliott's avatar Steve Elliott Committed by Automerger Merge Worker
Browse files

Merge "Remove pipeline construct thread asserts + effects" into tm-dev am: 54ad297e 

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



Change-Id: I07552453eeddc0593bfd01562dfbf6f30f86762c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7502c8e9 54ad297e

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

+3 −4
Original line number Diff line number Diff line
@@ -138,6 +138,7 @@ public class NotifCollection implements Dumpable { 
    private final NotifCollectionLogger mLogger;

    private final Handler mMainHandler;

    private final LogBufferEulogizer mEulogizer;

    private final DumpManager mDumpManager;



    private final Map<String, NotificationEntry> mNotificationSet = new ArrayMap<>();

    private final Collection<NotificationEntry> mReadOnlyNotificationSet =
@@ -163,15 +164,13 @@ public class NotifCollection implements Dumpable { 
            @Main Handler mainHandler,

            LogBufferEulogizer logBufferEulogizer,

            DumpManager dumpManager) {

        Assert.isMainThread();

        mStatusBarService = statusBarService;

        mClock = clock;

        mNotifPipelineFlags = notifPipelineFlags;

        mLogger = logger;

        mMainHandler = mainHandler;

        mEulogizer = logBufferEulogizer;



        dumpManager.registerDumpable(TAG, this);

        mDumpManager = dumpManager;

    }



    /** Initializes the NotifCollection and registers it to receive notification events. */
@@ -181,7 +180,7 @@ public class NotifCollection implements Dumpable { 
            throw new RuntimeException("attach() called twice");

        }

        mAttached = true;



        mDumpManager.registerDumpable(TAG, this);

        groupCoalescer.setNotificationHandler(mNotifHandler);

    }

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

+3 −3
Original line number Diff line number Diff line
@@ -91,6 +91,7 @@ public class ShadeListBuilder implements Dumpable { 
    private final SystemClock mSystemClock;

    private final ShadeListBuilderLogger mLogger;

    private final NotificationInteractionTracker mInteractionTracker;

    private final DumpManager mDumpManager;

    // used exclusivly by ShadeListBuilder#notifySectionEntriesUpdated

    private final ArrayList<ListEntry> mTempSectionMembers = new ArrayList<>();

    private final boolean mAlwaysLogList;
@@ -133,14 +134,12 @@ public class ShadeListBuilder implements Dumpable { 
            ShadeListBuilderLogger logger,

            SystemClock systemClock

    ) {

        Assert.isMainThread();

        mSystemClock = systemClock;

        mLogger = logger;

        mAlwaysLogList = flags.isDevLoggingEnabled();

        mInteractionTracker = interactionTracker;

        mChoreographer = pipelineChoreographer;

        dumpManager.registerDumpable(TAG, this);



        mDumpManager = dumpManager;

        setSectioners(Collections.emptyList());

    }
@@ -150,6 +149,7 @@ public class ShadeListBuilder implements Dumpable { 
     */

    public void attach(NotifCollection collection) {

        Assert.isMainThread();

        mDumpManager.registerDumpable(TAG, this);

        collection.addCollectionListener(mInteractionTracker);

        collection.setBuildListener(mReadyForBuildListener);

        mChoreographer.addOnEvalListener(this::buildList);