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

Commit 2ad14f88 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Move row check to requestPipeline instead of start" into rvc-dev am:...

Merge "Move row check to requestPipeline instead of start" into rvc-dev am: 614f1094 am: 6ac6bbe5 am: bf9a8778

Change-Id: I03264cb301c2fe2b3ccd5bf6d29f25289331f0c8
parents 5c600b15 bf9a8778
Loading
Loading
Loading
Loading
+5 −6
Original line number Diff line number Diff line
@@ -151,9 +151,12 @@ public final class NotifBindPipeline {
     * the real work once rather than repeatedly start and cancel it.
     */
    private void requestPipelineRun(NotificationEntry entry) {
        mLogger.logRequestPipelineRun(entry.getKey());

        final BindEntry bindEntry = getBindEntry(entry);
        if (bindEntry.row == null) {
            // Row is not managed yet but may be soon. Stop for now.
            return;
        }
        mLogger.logRequestPipelineRun(entry.getKey());

        // Abort any existing pipeline run
        mStage.abortStage(entry, bindEntry.row);
@@ -177,10 +180,6 @@ public final class NotifBindPipeline {

        final BindEntry bindEntry = mBindEntries.get(entry);
        final ExpandableNotificationRow row = bindEntry.row;
        if (row == null) {
            // Row is not managed yet but may be soon. Stop for now.
            return;
        }

        mStage.executeStage(entry, row, (en) -> onPipelineComplete(en));
    }