nyancrimew
/
LatinIME
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

am 1bc20700: Merge "[FileEncap4] Simplify logic" 

* commit '1bc20700d594af28bb87575df4279b0bed624c52':
  [FileEncap4] Simplify logic
main
Kurt Partridge 2013-03-06 12:06:44 -08:00 committed by Android Git Automerger
parent 0d4c792316 1bc20700d5
commit be4e180fab
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
java/src/com/android/inputmethod/research/UploaderService.java
View File

@ -110,6 +110,10 @@ public final class UploaderService extends IntentService {
return false; return false;
} }
private boolean isConvenientToUpload() {
return isExternallyPowered() && hasWifiConnection();
}
private boolean isExternallyPowered() { private boolean isExternallyPowered() {
final Intent intent = registerReceiver(null, new IntentFilter( final Intent intent = registerReceiver(null, new IntentFilter(
Intent.ACTION_BATTERY_CHANGED)); Intent.ACTION_BATTERY_CHANGED));
@ -126,10 +130,7 @@ public final class UploaderService extends IntentService {
} }
private void doUpload(final boolean isUploadingUnconditionally) { private void doUpload(final boolean isUploadingUnconditionally) {
if (!isUploadingUnconditionally && (!isExternallyPowered() || !hasWifiConnection() if (!(isUploadingUnconditionally || isConvenientToUpload())) return;
|| IS_INHIBITING_AUTO_UPLOAD)) {
return;
}
if (mFilesDir == null) { if (mFilesDir == null) {
return; return;
} }