diff --git a/java/src/com/android/inputmethod/research/UploaderService.java b/java/src/com/android/inputmethod/research/UploaderService.java
index 89c67fb..7acd79d 100644
--- a/java/src/com/android/inputmethod/research/UploaderService.java
+++ b/java/src/com/android/inputmethod/research/UploaderService.java
@@ -72,10 +72,7 @@
         mFilesDir = null;
         mUrl = null;
 
-        final PackageManager packageManager = getPackageManager();
-        final boolean hasPermission = packageManager.checkPermission(Manifest.permission.INTERNET,
-                getPackageName()) == PackageManager.PERMISSION_GRANTED;
-        if (!hasPermission) {
+        if (!hasUploadingPermission()) {
             return;
         }
 
@@ -92,6 +89,12 @@
         }
     }
 
+    private boolean hasUploadingPermission() {
+        final PackageManager packageManager = getPackageManager();
+        return packageManager.checkPermission(Manifest.permission.INTERNET,
+                getPackageName()) == PackageManager.PERMISSION_GRANTED;
+    }
+
     @Override
     protected void onHandleIntent(Intent intent) {
         if (!mCanUpload) {
