Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 7c3e493d: Merge change 25177 into eclair

Browse Source 
Merge commit '7c3e493d7b2db7f28d6fdb52d79c4d99ef1502b8' into eclair-plus-aosp

* commit '7c3e493d7b2db7f28d6fdb52d79c4d99ef1502b8':
  Fix for #2092883: Allow manual sync even when background data is disabled
This commit is contained in:
Jim Miller
2009-09-15 18:20:10 -07:00
committed by Android Git Automerger
parent 7eeda712a9 7c3e493d7b
commit f2b0fb8c91
1 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/java/android/content/SyncManager.java
View File

@@ -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