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

Merge "Avoid sync when UID network is disconnected."

Browse Source
This commit is contained in:
Jeff Sharkey
2011-07-27 09:41:39 -07:00
committed by Android (Google) Code Review
parent a94b9ad23a 34821881c1
commit 693d0427b7
1 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1691,12 +1691,28 @@ public class SyncManager implements OnAccountsUpdateListener {
continue;
}
// skip the sync if it isn't manual and auto sync or
// background data usage is disabled
final RegisteredServicesCache.ServiceInfo<SyncAdapterType> syncAdapterInfo;
syncAdapterInfo = mSyncAdapters.getServiceInfo(
SyncAdapterType.newKey(op.authority, op.account.type));
// only proceed if network is connected for requesting UID
final boolean uidNetworkConnected;
if (syncAdapterInfo != null) {
final NetworkInfo networkInfo = getConnectivityManager()
.getActiveNetworkInfoForUid(syncAdapterInfo.uid);
uidNetworkConnected = networkInfo != null && networkInfo.isConnected();
} else {
uidNetworkConnected = false;
}
// skip the sync if it isn't manual, and auto sync or
// background data usage is disabled or network is
// disconnected for the target UID.
if (!op.extras.getBoolean(ContentResolver.SYNC_EXTRAS_IGNORE_SETTINGS, false)
&& (syncableState > 0)
&& (!masterSyncAutomatically
|| !backgroundDataUsageAllowed
|| !uidNetworkConnected
|| !mSyncStorageEngine.getSyncAutomatically(
op.account, op.authority))) {
operationIterator.remove();