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

This commit is contained in:
TreeHugger Robot
2020-04-07 15:49:23 +00:00
committed by Android (Google) Code Review

View File

@@ -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));
}