nyancrimew
/
LatinIME
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Kill+restart tasks before/after decoder init. 

Bug 19625976.

Change-Id: I6d8b0d2b0a77ccda1bfc914501cf568b92862980
main
Dan Zivkovic 2015-03-09 18:26:52 -07:00
parent bd1bc4067f
commit 375035905d
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
java-overridable/src/com/android/inputmethod/latin/utils/StatsUtilsManager.java
View File

@ -26,12 +26,17 @@ import com.android.inputmethod.latin.settings.SettingsValues;
public class StatsUtilsManager { public class StatsUtilsManager {
private static final StatsUtilsManager sInstance = new StatsUtilsManager(); private static final StatsUtilsManager sInstance = new StatsUtilsManager();
private static StatsUtilsManager sTestInstance = null;
/** /**
* @return the singleton instance of {@link StatsUtilsManager}. * @return the singleton instance of {@link StatsUtilsManager}.
*/ */
public static StatsUtilsManager getInstance() { public static StatsUtilsManager getInstance() {
return sInstance; return sTestInstance != null ? sTestInstance : sInstance;
}
public static void setTestInstance(final StatsUtilsManager testInstance) {
sTestInstance = testInstance;
} }
public void onCreate(final Context context, final DictionaryFacilitator dictionaryFacilitator) { public void onCreate(final Context context, final DictionaryFacilitator dictionaryFacilitator) {

11
java/src/com/android/inputmethod/latin/utils/ExecutorUtils.java
View File

@ -23,7 +23,6 @@ import com.android.inputmethod.annotations.UsedForTesting;
import java.lang.Thread.UncaughtExceptionHandler; import java.lang.Thread.UncaughtExceptionHandler;
import java.util.concurrent.Executors; import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.ScheduledFuture;
import java.util.concurrent.ThreadFactory; import java.util.concurrent.ThreadFactory;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
@ -74,6 +73,16 @@ public class ExecutorUtils {
return sExecutorService; return sExecutorService;
} }
public static void killTasks() {
getBackgroundExecutor().shutdownNow();
try {
getBackgroundExecutor().awaitTermination(5, TimeUnit.SECONDS);
} catch (InterruptedException e) {
Log.wtf(TAG, "Failed to shut down background task.");
throw new IllegalStateException("Failed to shut down background task.");
}
}
public static Runnable chain(final Runnable... runnables) { public static Runnable chain(final Runnable... runnables) {
return new RunnableChain(runnables); return new RunnableChain(runnables);
} }