From 88f466678c17bb32c274a5367da0d6138679ab6b Mon Sep 17 00:00:00 2001
From: Kurt Partridge <kep@google.com>
Date: Wed, 27 Feb 2013 12:27:50 -0800
Subject: [PATCH] [FileEncap4] Simplify logic
Change-Id: Ibb8660d12812b867856259d3e5c04a31e281027d
---
.../android/inputmethod/research/UploaderService.java | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/java/src/com/android/inputmethod/research/UploaderService.java b/java/src/com/android/inputmethod/research/UploaderService.java
index 13a98567e9..bb70c43182 100644
--- a/java/src/com/android/inputmethod/research/UploaderService.java
+++ b/java/src/com/android/inputmethod/research/UploaderService.java
@@ -110,6 +110,10 @@ public final class UploaderService extends IntentService {
return false;
}
+ private boolean isConvenientToUpload() {
+ return isExternallyPowered() && hasWifiConnection();
+ }
+
private boolean isExternallyPowered() {
final Intent intent = registerReceiver(null, new IntentFilter(
Intent.ACTION_BATTERY_CHANGED));
@@ -126,10 +130,7 @@ public final class UploaderService extends IntentService {
}
private void doUpload(final boolean isUploadingUnconditionally) {
- if (!isUploadingUnconditionally && (!isExternallyPowered() || !hasWifiConnection()
- || IS_INHIBITING_AUTO_UPLOAD)) {
- return;
- }
+ if (!(isUploadingUnconditionally || isConvenientToUpload())) return;
if (mFilesDir == null) {
return;
}
--
GitLab