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

Commit d2a3a8a7 authored by Jim Miller's avatar Jim Miller
Browse files

Fix for #2092883: Allow manual sync even when background data is disabled

parent 151921a6

core/java/android/content/SyncManager.java

+4 −8
Original line number Diff line number Diff line
@@ -583,13 +583,8 @@ class SyncManager implements OnAccountsUpdatedListener { 
            return;

        }



        if (!getConnectivityManager().getBackgroundDataSetting()) {

            if (isLoggable) {

                Log.v(TAG, "not syncing because background data usage isn't allowed");

            }

            setStatusText("Sync is disabled.");

            return;

        }

        final boolean backgroundDataUsageAllowed =

                getConnectivityManager().getBackgroundDataSetting();



        if (mAccounts == null) setStatusText("The accounts aren't known yet.");

        if (!mDataConnectionIsConnected) setStatusText("No data connection");
@@ -686,7 +681,8 @@ class SyncManager implements OnAccountsUpdatedListener { 
                    } else {

                        final boolean syncAutomatically = masterSyncAutomatically

                                && mSyncStorageEngine.getSyncAutomatically(account, authority);

                        boolean syncAllowed = manualSync || syncAutomatically;

                        boolean syncAllowed =

                                manualSync || (backgroundDataUsageAllowed && syncAutomatically);

                        if (!syncAllowed) {

                            if (isLoggable) {

                                Log.d(TAG, "scheduleSync: sync of " + account + ", " + authority