2 files changed, 13 insertions, 5 deletions
diff --git a/java/com/android/dialer/common/concurrent/DialerExecutorComponent.java b/java/com/android/dialer/common/concurrent/DialerExecutorComponent.java
index 28abf96fd..734891430 100644
--- a/java/com/android/dialer/common/concurrent/DialerExecutorComponent.java
+++ b/java/com/android/dialer/common/concurrent/DialerExecutorComponent.java
@@ -18,6 +18,8 @@ package com.android.dialer.common.concurrent;
 
 import android.app.FragmentManager;
 import android.content.Context;
+import com.android.dialer.common.concurrent.Annotations.BackgroundExecutor;
+import com.android.dialer.common.concurrent.Annotations.LightweightExecutor;
 import com.android.dialer.common.concurrent.Annotations.NonUiParallel;
 import com.android.dialer.common.concurrent.Annotations.Ui;
 import com.android.dialer.inject.HasRootComponent;
@@ -31,17 +33,23 @@ public abstract class DialerExecutorComponent {
 
   public abstract DialerExecutorFactory dialerExecutorFactory();
 
+  @NonUiParallel
+  public abstract ExecutorService lowPriorityThreadPool();
+
   @Ui
-  public abstract ListeningExecutorService uiExecutorService();
+  public abstract ListeningExecutorService uiExecutor();
+
+  @BackgroundExecutor
+  public abstract ListeningExecutorService backgroundExecutor();
+
+  @LightweightExecutor
+  public abstract ListeningExecutorService lightweightExecutor();
 
   public <OutputT> UiListener<OutputT> createUiListener(
       FragmentManager fragmentManager, String taskId) {
     return UiListener.create(fragmentManager, taskId);
   }
 
-  @NonUiParallel
-  public abstract ExecutorService lowPriorityThreadPool();
-
   public static DialerExecutorComponent get(Context context) {
     return ((DialerExecutorComponent.HasComponent)
             ((HasRootComponent) context.getApplicationContext()).component())
diff --git a/java/com/android/dialer/common/concurrent/UiListener.java b/java/com/android/dialer/common/concurrent/UiListener.java
index df791301f..b5922f9c8 100644
--- a/java/com/android/dialer/common/concurrent/UiListener.java
+++ b/java/com/android/dialer/common/concurrent/UiListener.java
@@ -96,7 +96,7 @@ public class UiListener<OutputT> extends Fragment {
     Futures.addCallback(
         Assert.isNotNull(future),
         callbackWrapper,
-        DialerExecutorComponent.get(context).uiExecutorService());
+        DialerExecutorComponent.get(context).uiExecutor());
   }
 
   private static class CallbackWrapper<OutputT> implements FutureCallback<OutputT> {