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

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

Merge "[FileEncap1] Extract hasUploadingPermisssions method"

parents 80353652 347b2ebe
Loading
Loading
Loading
Loading
+7 −4
Original line number Diff line number Diff line
@@ -72,10 +72,7 @@ public final class UploaderService extends IntentService {
        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 @@ public final class UploaderService extends IntentService {
        }
    }

    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) {