From 9642286c0140bf78f11d9229c12a07a3c1ac7ff6 Mon Sep 17 00:00:00 2001
From: Keisuke Kuroyanagi <ksk@google.com>
Date: Fri, 13 Dec 2013 14:48:43 +0900
Subject: Make ExpandableBinaryDictionary usable for offdevice tests.

Bug: 11956652
Change-Id: If5a503ef161781818f2efceba542be5a61be6bd1
---
 .../latin/ExpandableBinaryDictionary.java            | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

(limited to 'java/src/com/android/inputmethod/latin/ExpandableBinaryDictionary.java')

diff --git a/java/src/com/android/inputmethod/latin/ExpandableBinaryDictionary.java b/java/src/com/android/inputmethod/latin/ExpandableBinaryDictionary.java
index 9f5cd162f..7afd657a0 100644
--- a/java/src/com/android/inputmethod/latin/ExpandableBinaryDictionary.java
+++ b/java/src/com/android/inputmethod/latin/ExpandableBinaryDictionary.java
@@ -17,7 +17,6 @@
 package com.android.inputmethod.latin;
 
 import android.content.Context;
-import android.os.SystemClock;
 import android.util.Log;
 
 import com.android.inputmethod.annotations.UsedForTesting;
@@ -181,6 +180,19 @@ abstract public class ExpandableBinaryDictionary extends Dictionary {
         return executor;
     }
 
+    /**
+     * Shutdowns all executors and removes all executors from the executor map for testing.
+     */
+    @UsedForTesting
+    public static void shutdownAllExecutors() {
+        synchronized(sDictNameExecutorMap) {
+            for (final PrioritizedSerialExecutor executor : sDictNameExecutorMap.values()) {
+                executor.shutdown();
+                sDictNameExecutorMap.remove(executor);
+            }
+        }
+    }
+
     private static AbstractDictionaryWriter getDictionaryWriter(final Context context,
             final boolean isDynamicPersonalizationDictionary) {
         if (isDynamicPersonalizationDictionary) {
@@ -504,7 +516,7 @@ abstract public class ExpandableBinaryDictionary extends Dictionary {
      * dictionary exists, this method will generate one.
      */
     protected void loadDictionary() {
-        mPerInstanceDictionaryUpdateController.mLastUpdateRequestTime = SystemClock.uptimeMillis();
+        mPerInstanceDictionaryUpdateController.mLastUpdateRequestTime = System.currentTimeMillis();
         reloadDictionaryIfRequired();
     }
 
@@ -600,7 +612,7 @@ abstract public class ExpandableBinaryDictionary extends Dictionary {
      *        the current binary dictionary from file.
      */
     protected void setRequiresReload(final boolean requiresRebuild) {
-        final long time = SystemClock.uptimeMillis();
+        final long time = System.currentTimeMillis();
         mPerInstanceDictionaryUpdateController.mLastUpdateRequestTime = time;
         mDictNameDictionaryUpdateController.mLastUpdateRequestTime = time;
         if (DEBUG) {
@@ -648,7 +660,7 @@ abstract public class ExpandableBinaryDictionary extends Dictionary {
             @Override
             public void run() {
                 try {
-                    final long time = SystemClock.uptimeMillis();
+                    final long time = System.currentTimeMillis();
                     final boolean dictionaryFileExists = dictionaryFileExists();
                     if (mDictNameDictionaryUpdateController.isOutOfDate()
                             || !dictionaryFileExists) {
-- 
cgit v1.2.3-83-g751a