diff --git a/java/src/com/android/inputmethod/research/UploaderService.java b/java/src/com/android/inputmethod/research/UploaderService.java
index bb70c4318..eb5bdefb7 100644
--- a/java/src/com/android/inputmethod/research/UploaderService.java
+++ b/java/src/com/android/inputmethod/research/UploaderService.java
@@ -99,7 +99,9 @@ public final class UploaderService extends IntentService {
     @Override
     protected void onHandleIntent(Intent intent) {
         if (!isPossibleToUpload()) return;
-        doUpload(isUploadingUnconditionally(intent.getExtras()));
+        if (isUploadingUnconditionally(intent.getExtras()) || isConvenientToUpload()) {
+            doUpload();
+        }
     }
 
     private boolean isUploadingUnconditionally(final Bundle bundle) {
@@ -129,8 +131,7 @@ public final class UploaderService extends IntentService {
         return wifiInfo.isConnected();
     }
 
-    private void doUpload(final boolean isUploadingUnconditionally) {
-        if (!(isUploadingUnconditionally || isConvenientToUpload())) return;
+    private void doUpload() {
         if (mFilesDir == null) {
             return;
         }