Merge changes I63e93080,Iff15e216

* changes:
  Renamed string.xml to strings.xml to match Android convention
  Add UiThreadExecutor

4 files changed, 90 insertions, 0 deletions

diff --git a/java/com/android/dialer/assisteddialing/ui/res/values/string.xml b/java/com/android/dialer/assisteddialing/ui/res/values/strings.xml
index 3b40817ed..3b40817ed 100644
--- a/java/com/android/dialer/assisteddialing/ui/res/values/string.xml
+++ b/java/com/android/dialer/assisteddialing/ui/res/values/strings.xml
diff --git a/java/com/android/dialer/common/concurrent/Annotations.java b/java/com/android/dialer/common/concurrent/Annotations.java
index eb956c31e..5e3954cf9 100644
--- a/java/com/android/dialer/common/concurrent/Annotations.java
+++ b/java/com/android/dialer/common/concurrent/Annotations.java
@@ -20,6 +20,10 @@ import javax.inject.Qualifier;
 /** Annotations for dagger concurrency bindings. */
 public class Annotations {
 
+  /** Annotation for retrieving the UI thread. */
+  @Qualifier
+  public @interface Ui {}
+
   /** Annotation for retrieving the non-UI thread pool. */
   @Qualifier
   public @interface NonUiParallel {}
diff --git a/java/com/android/dialer/common/concurrent/DialerExecutorModule.java b/java/com/android/dialer/common/concurrent/DialerExecutorModule.java
index 68910fb7a..5e0190e8d 100644
--- a/java/com/android/dialer/common/concurrent/DialerExecutorModule.java
+++ b/java/com/android/dialer/common/concurrent/DialerExecutorModule.java
@@ -19,8 +19,10 @@ import android.os.AsyncTask;
 import com.android.dialer.common.LogUtil;
 import com.android.dialer.common.concurrent.Annotations.NonUiParallel;
 import com.android.dialer.common.concurrent.Annotations.NonUiSerial;
+import com.android.dialer.common.concurrent.Annotations.Ui;
 import com.android.dialer.common.concurrent.Annotations.UiParallel;
 import com.android.dialer.common.concurrent.Annotations.UiSerial;
+import com.google.common.util.concurrent.ListeningExecutorService;
 import dagger.Binds;
 import dagger.Module;
 import dagger.Provides;
@@ -41,6 +43,13 @@ public abstract class DialerExecutorModule {
 
   @Provides
   @Singleton
+  @Ui
+  static ListeningExecutorService provideUiThreadExecutorService() {
+    return new UiThreadExecutor();
+  }
+
+  @Provides
+  @Singleton
   @NonUiParallel
   static ExecutorService provideNonUiThreadPool() {
     return Executors.newFixedThreadPool(
diff --git a/java/com/android/dialer/common/concurrent/UiThreadExecutor.java b/java/com/android/dialer/common/concurrent/UiThreadExecutor.java
new file mode 100644
index 000000000..7b95d70ea
--- /dev/null
+++ b/java/com/android/dialer/common/concurrent/UiThreadExecutor.java
@@ -0,0 +1,77 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+package com.android.dialer.common.concurrent;
+
+import com.google.common.util.concurrent.AbstractListeningExecutorService;
+import com.google.common.util.concurrent.ListenableFuture;
+import com.google.common.util.concurrent.SettableFuture;
+import java.util.List;
+import java.util.concurrent.Callable;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * An ExecutorService that delegates to the UI thread. Rejects attempts to shut down, and all
+ * shutdown related APIs are unimplemented.
+ *
+ */
+public class UiThreadExecutor extends AbstractListeningExecutorService {
+
+  @Override
+  public void shutdown() {
+    throw new UnsupportedOperationException();
+  }
+
+  @Override
+  public List<Runnable> shutdownNow() {
+    throw new UnsupportedOperationException();
+  }
+
+  @Override
+  public boolean isShutdown() {
+    return false;
+  }
+
+  @Override
+  public boolean isTerminated() {
+    return false;
+  }
+
+  @Override
+  public boolean awaitTermination(long l, TimeUnit timeUnit) throws InterruptedException {
+    throw new UnsupportedOperationException();
+  }
+
+  @Override
+  public <V> ListenableFuture<V> submit(final Callable<V> task) {
+    final SettableFuture<V> resultFuture = SettableFuture.create();
+    ThreadUtil.postOnUiThread(
+        () -> {
+          try {
+            resultFuture.set(task.call());
+          } catch (Exception e) {
+            // uncaught exceptions on the UI thread should crash the app
+            resultFuture.setException(e);
+            throw new RuntimeException(e);
+          }
+        });
+    return resultFuture;
+  }
+
+  @Override
+  public void execute(final Runnable runnable) {
+    ThreadUtil.postOnUiThread(runnable);
+  }
+}