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

Commit 581225ad 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: 41f56050

Change-Id: I26c38e145ee27554c8be497dea2a844951bc6426
parents 5e3721f8 41f56050
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));
    }