2 files changed, 65 insertions, 1 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/util/concurrency/Execution.kt b/packages/SystemUI/src/com/android/systemui/util/concurrency/Execution.kt
new file mode 100644
index 000000000000..647faeba1e77
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/util/concurrency/Execution.kt
@@ -0,0 +1,58 @@
+/*
+ * Copyright (C) 2021 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.systemui.util.concurrency
+
+import android.os.Looper
+import javax.inject.Inject
+
+/**
+ * Methods to check or assert that we're on the main thread
+ */
+interface Execution {
+    fun assertIsMainThread()
+    fun isMainThread(): Boolean
+}
+
+class ExecutionImpl @Inject constructor() : Execution {
+    private val mainLooper = Looper.getMainLooper()
+
+    override fun assertIsMainThread() {
+        if (!mainLooper.isCurrentThread) {
+            throw IllegalStateException("should be called from the main thread." +
+                    " Main thread name=" + mainLooper.thread.name +
+                    " Thread.currentThread()=" + Thread.currentThread().name)
+        }
+    }
+
+    override fun isMainThread(): Boolean {
+        return mainLooper.isCurrentThread
+    }
+}
+
+class FakeExecution : Execution {
+    var simulateMainThread = true
+
+    override fun assertIsMainThread() {
+        if (!simulateMainThread) {
+            throw IllegalStateException("should be called from the main thread")
+        }
+    }
+
+    override fun isMainThread(): Boolean {
+        return simulateMainThread
+    }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/util/concurrency/GlobalConcurrencyModule.java b/packages/SystemUI/src/com/android/systemui/util/concurrency/GlobalConcurrencyModule.java
index 5946af383b0f..1c504961e715 100644
--- a/packages/SystemUI/src/com/android/systemui/util/concurrency/GlobalConcurrencyModule.java
+++ b/packages/SystemUI/src/com/android/systemui/util/concurrency/GlobalConcurrencyModule.java
@@ -24,6 +24,8 @@ import com.android.systemui.dagger.qualifiers.Main;
 
 import java.util.concurrent.Executor;
 
+import javax.inject.Singleton;
+
 import dagger.Binds;
 import dagger.Module;
 import dagger.Provides;
@@ -40,7 +42,7 @@ public abstract class GlobalConcurrencyModule {
     @Binds
     public abstract ThreadFactory bindExecutorFactory(ThreadFactoryImpl impl);
 
-     /** Main Looper */
+    /** Main Looper */
     @Provides
     @Main
     public static  Looper provideMainLooper() {
@@ -67,4 +69,8 @@ public abstract class GlobalConcurrencyModule {
         return context.getMainExecutor();
     }
 
+    /** */
+    @Binds
+    @Singleton
+    public abstract Execution provideExecution(ExecutionImpl execution);
 }