Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1bc20700 authored by Kurt Partridge's avatar Kurt Partridge Committed by Android (Google) Code Review
Browse files

Merge "[FileEncap4] Simplify logic"

parents 719bb3aa 88f46667

java/src/com/android/inputmethod/research/UploaderService.java

+5 −4
Original line number Diff line number Diff line
@@ -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;

        }