am 625cfe3d: Merge "ResearchLog uploadingService now waits for logging to finish" into jb-mr1-dev

* commit '625cfe3d2119538b508c0d2eb82d1098579e467e':
  ResearchLog uploadingService now waits for logging to finish

1 files changed, 4 insertions, 1 deletions

diff --git a/java/src/com/android/inputmethod/research/ResearchLog.java b/java/src/com/android/inputmethod/research/ResearchLog.java
index cd9ff85f8..369c6e0df 100644
--- a/java/src/com/android/inputmethod/research/ResearchLog.java
+++ b/java/src/com/android/inputmethod/research/ResearchLog.java
@@ -93,7 +93,7 @@ public class ResearchLog {
         mFile = outputFile;
     }
 
-    public synchronized void close() {
+    public synchronized void close(final Runnable onClosed) {
         mExecutor.submit(new Callable<Object>() {
             @Override
             public Object call() throws Exception {
@@ -111,6 +111,9 @@ public class ResearchLog {
                     if (mFile.exists()) {
                         mFile.setWritable(false, false);
                     }
+                    if (onClosed != null) {
+                        onClosed.run();
+                    }
                 }
                 return null;
             }