1 files changed, 7 insertions, 2 deletions
diff --git a/java/src/com/android/inputmethod/latin/utils/ExecutorUtils.java b/java/src/com/android/inputmethod/latin/utils/ExecutorUtils.java
index ee9718ad3..ed502ed3d 100644
--- a/java/src/com/android/inputmethod/latin/utils/ExecutorUtils.java
+++ b/java/src/com/android/inputmethod/latin/utils/ExecutorUtils.java
@@ -47,8 +47,13 @@ public class ExecutorUtils {
     public static void shutdownAllExecutors() {
         synchronized(sExecutorMap) {
             for (final PrioritizedSerialExecutor executor : sExecutorMap.values()) {
-                executor.shutdown();
-                sExecutorMap.remove(executor);
+                executor.execute(new Runnable() {
+                    @Override
+                    public void run() {
+                        executor.shutdown();
+                        sExecutorMap.remove(executor);
+                    }
+                });
             }
         }
     }