Added bindings for ListeningExecutorServices.

Use them where appropriate.

Bug: 34672501
Test: existing
PiperOrigin-RevId: 178182298
Change-Id: If454225e0d636c7cb14b5af02d46780d7732abf0

2 files changed, 16 insertions, 18 deletions

diff --git a/java/com/android/dialer/calllog/datasources/phonelookup/PhoneLookupDataSource.java b/java/com/android/dialer/calllog/datasources/phonelookup/PhoneLookupDataSource.java
index 41eaf2bae..9b90ad5cc 100644
--- a/java/com/android/dialer/calllog/datasources/phonelookup/PhoneLookupDataSource.java
+++ b/java/com/android/dialer/calllog/datasources/phonelookup/PhoneLookupDataSource.java
@@ -29,7 +29,7 @@ import com.android.dialer.calllog.database.contract.AnnotatedCallLogContract.Ann
 import com.android.dialer.calllog.datasources.CallLogDataSource;
 import com.android.dialer.calllog.datasources.CallLogMutations;
 import com.android.dialer.common.LogUtil;
-import com.android.dialer.common.concurrent.Annotations.NonUiParallel;
+import com.android.dialer.common.concurrent.Annotations.BackgroundExecutor;
 import com.android.dialer.phonelookup.PhoneLookup;
 import com.android.dialer.phonelookup.PhoneLookupInfo;
 import com.android.dialer.phonelookup.PhoneLookupSelector;
@@ -40,7 +40,6 @@ import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Maps;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.ListeningExecutorService;
-import com.google.common.util.concurrent.MoreExecutors;
 import com.google.i18n.phonenumbers.PhoneNumberUtil;
 import com.google.protobuf.InvalidProtocolBufferException;
 import java.util.Arrays;
@@ -49,7 +48,6 @@ import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
 import java.util.concurrent.ExecutionException;
-import java.util.concurrent.ExecutorService;
 import javax.inject.Inject;
 
 /**
@@ -59,27 +57,29 @@ import javax.inject.Inject;
 public final class PhoneLookupDataSource implements CallLogDataSource {
 
   private final PhoneLookup phoneLookup;
-  private final ListeningExecutorService executorService;
+  private final ListeningExecutorService backgroundExecutorService;
 
   @Inject
-  PhoneLookupDataSource(PhoneLookup phoneLookup, @NonUiParallel ExecutorService executorService) {
+  PhoneLookupDataSource(
+      PhoneLookup phoneLookup,
+      @BackgroundExecutor ListeningExecutorService backgroundExecutorService) {
     this.phoneLookup = phoneLookup;
-    this.executorService = MoreExecutors.listeningDecorator(executorService);
+    this.backgroundExecutorService = backgroundExecutorService;
   }
 
   @Override
   public ListenableFuture<Boolean> isDirty(Context appContext) {
-    return executorService.submit(() -> isDirtyInternal(appContext));
+    return backgroundExecutorService.submit(() -> isDirtyInternal(appContext));
   }
 
   @Override
   public ListenableFuture<Void> fill(Context appContext, CallLogMutations mutations) {
-    return executorService.submit(() -> fillInternal(appContext, mutations));
+    return backgroundExecutorService.submit(() -> fillInternal(appContext, mutations));
   }
 
   @Override
   public ListenableFuture<Void> onSuccessfulFill(Context appContext) {
-    return executorService.submit(this::onSuccessfulFillInternal);
+    return backgroundExecutorService.submit(this::onSuccessfulFillInternal);
   }
 
   @WorkerThread
diff --git a/java/com/android/dialer/calllog/datasources/systemcalllog/SystemCallLogDataSource.java b/java/com/android/dialer/calllog/datasources/systemcalllog/SystemCallLogDataSource.java
index dfc768c0a..91db915ef 100644
--- a/java/com/android/dialer/calllog/datasources/systemcalllog/SystemCallLogDataSource.java
+++ b/java/com/android/dialer/calllog/datasources/systemcalllog/SystemCallLogDataSource.java
@@ -45,7 +45,7 @@ import com.android.dialer.calllog.datasources.util.RowCombiner;
 import com.android.dialer.calllogutils.PhoneAccountUtils;
 import com.android.dialer.common.Assert;
 import com.android.dialer.common.LogUtil;
-import com.android.dialer.common.concurrent.Annotations.NonUiParallel;
+import com.android.dialer.common.concurrent.Annotations.BackgroundExecutor;
 import com.android.dialer.common.concurrent.ThreadUtil;
 import com.android.dialer.phonenumberproto.DialerPhoneNumberUtil;
 import com.android.dialer.storage.StorageComponent;
@@ -53,12 +53,10 @@ import com.android.dialer.theme.R;
 import com.android.dialer.util.PermissionsUtil;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.ListeningExecutorService;
-import com.google.common.util.concurrent.MoreExecutors;
 import com.google.i18n.phonenumbers.PhoneNumberUtil;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Set;
-import java.util.concurrent.ExecutorService;
 import javax.inject.Inject;
 
 /**
@@ -71,13 +69,13 @@ public class SystemCallLogDataSource implements CallLogDataSource {
   @VisibleForTesting
   static final String PREF_LAST_TIMESTAMP_PROCESSED = "systemCallLogLastTimestampProcessed";
 
-  private final ListeningExecutorService executorService;
+  private final ListeningExecutorService backgroundExecutorService;
 
   @Nullable private Long lastTimestampProcessed;
 
   @Inject
-  SystemCallLogDataSource(@NonUiParallel ExecutorService executorService) {
-    this.executorService = MoreExecutors.listeningDecorator(executorService);
+  SystemCallLogDataSource(@BackgroundExecutor ListeningExecutorService backgroundExecutorService) {
+    this.backgroundExecutorService = backgroundExecutorService;
   }
 
   @MainThread
@@ -105,17 +103,17 @@ public class SystemCallLogDataSource implements CallLogDataSource {
 
   @Override
   public ListenableFuture<Boolean> isDirty(Context appContext) {
-    return executorService.submit(() -> isDirtyInternal(appContext));
+    return backgroundExecutorService.submit(() -> isDirtyInternal(appContext));
   }
 
   @Override
   public ListenableFuture<Void> fill(Context appContext, CallLogMutations mutations) {
-    return executorService.submit(() -> fillInternal(appContext, mutations));
+    return backgroundExecutorService.submit(() -> fillInternal(appContext, mutations));
   }
 
   @Override
   public ListenableFuture<Void> onSuccessfulFill(Context appContext) {
-    return executorService.submit(() -> onSuccessfulFillInternal(appContext));
+    return backgroundExecutorService.submit(() -> onSuccessfulFillInternal(appContext));
   }
 
   @WorkerThread