From 922cbed7a9ea329c3d1f89f64de14e35a26b96ea Mon Sep 17 00:00:00 2001 From: Zachary Heidepriem Date: Sat, 11 Nov 2017 18:49:27 -0800 Subject: Add UiThreadExecutor This CL adds an executor which runs tasks on the Ui thread, using the existing ThreadUtil class. Bug: 67752611 Test: UiThreadExecutorTest PiperOrigin-RevId: 175046280 Change-Id: Iff15e216be0e91891a9d63fddf1288ecbec41f83 --- Android.mk | 11 ++++ .../dialer/common/concurrent/Annotations.java | 4 ++ .../common/concurrent/DialerExecutorModule.java | 9 +++ .../dialer/common/concurrent/UiThreadExecutor.java | 77 ++++++++++++++++++++++ 4 files changed, 101 insertions(+) create mode 100644 java/com/android/dialer/common/concurrent/UiThreadExecutor.java diff --git a/Android.mk b/Android.mk index e9841d9dc..3c0b34c13 100644 --- a/Android.mk +++ b/Android.mk @@ -189,6 +189,7 @@ LOCAL_STATIC_JAVA_LIBRARIES := \ dialer-libshortcutbadger-target \ dialer-mime4j-core-target \ dialer-mime4j-dom-target \ + dialer-error-prone-target \ dialer-guava-target \ jsr305 \ libbackup \ @@ -292,6 +293,16 @@ include $(BUILD_PREBUILT) include $(CLEAR_VARS) +LOCAL_MODULE_CLASS := JAVA_LIBRARIES +LOCAL_MODULE := dialer-error-prone-target +LOCAL_SDK_VERSION := current +LOCAL_SRC_FILES := ../../../prebuilts/tools/common/m2/repository/com/google/errorprone/error_prone_annotations/2.0.18/error_prone_annotations-2.0.18$(COMMON_JAVA_PACKAGE_SUFFIX) +LOCAL_UNINSTALLABLE_MODULE := true + +include $(BUILD_PREBUILT) + +include $(CLEAR_VARS) + LOCAL_MODULE_CLASS := JAVA_LIBRARIES LOCAL_MODULE := dialer-dagger2-target LOCAL_SDK_VERSION := current 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; @@ -39,6 +41,13 @@ public abstract class DialerExecutorModule { abstract DialerExecutorFactory bindDialerExecutorFactory( DefaultDialerExecutorFactory defaultDialerExecutorFactory); + @Provides + @Singleton + @Ui + static ListeningExecutorService provideUiThreadExecutorService() { + return new UiThreadExecutor(); + } + @Provides @Singleton @NonUiParallel 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 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 ListenableFuture submit(final Callable task) { + final SettableFuture 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); + } +} -- cgit v1.2.3