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

Merge "fix deadlock caused by clearAllBackoffs in SSE" into klp-dev

Browse Source
This commit is contained in:
Matthew Williams
2013-09-23 17:35:16 +00:00
committed by Android (Google) Code Review
parent a9f97a0a58 ed37b93af8
commit 75256476c8
2 changed files with 25 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/java/com/android/server/content/SyncManager.java
View File

@@ -315,7 +315,9 @@ public class SyncManager {
if (Log.isLoggable(TAG, Log.VERBOSE)) {
Log.v(TAG, "Reconnection detected: clearing all backoffs");
}
mSyncStorageEngine.clearAllBackoffs(mSyncQueue);
synchronized(mSyncQueue) {
mSyncStorageEngine.clearAllBackoffsLocked(mSyncQueue);
}
}
sendCheckAlarmsMessage();
}

41
services/java/com/android/server/content/SyncStorageEngine.java
View File

@@ -710,28 +710,31 @@ public class SyncStorageEngine extends Handler {
}
}
public void clearAllBackoffs(SyncQueue syncQueue) {
/**
* Callers of this function need to hold a lock for syncQueue object passed in. Bear in mind
* this function grabs the lock for {@link #mAuthorities}
* @param syncQueue queue containing pending sync operations.
*/
public void clearAllBackoffsLocked(SyncQueue syncQueue) {
boolean changed = false;
synchronized (mAuthorities) {
synchronized (syncQueue) {
for (AccountInfo accountInfo : mAccounts.values()) {
for (AuthorityInfo authorityInfo : accountInfo.authorities.values()) {
if (authorityInfo.backoffTime != NOT_IN_BACKOFF_MODE
|| authorityInfo.backoffDelay != NOT_IN_BACKOFF_MODE) {
if (DEBUG) {
Log.v(TAG, "clearAllBackoffs:"
+ " authority:" + authorityInfo.authority
+ " account:" + accountInfo.accountAndUser.account.name
+ " user:" + accountInfo.accountAndUser.userId
+ " backoffTime was: " + authorityInfo.backoffTime
+ " backoffDelay was: " + authorityInfo.backoffDelay);
}
authorityInfo.backoffTime = NOT_IN_BACKOFF_MODE;
authorityInfo.backoffDelay = NOT_IN_BACKOFF_MODE;
syncQueue.onBackoffChanged(accountInfo.accountAndUser.account,
accountInfo.accountAndUser.userId, authorityInfo.authority, 0);
changed = true;
for (AccountInfo accountInfo : mAccounts.values()) {
for (AuthorityInfo authorityInfo : accountInfo.authorities.values()) {
if (authorityInfo.backoffTime != NOT_IN_BACKOFF_MODE
|| authorityInfo.backoffDelay != NOT_IN_BACKOFF_MODE) {
if (DEBUG) {
Log.v(TAG, "clearAllBackoffs:"
+ " authority:" + authorityInfo.authority
+ " account:" + accountInfo.accountAndUser.account.name
+ " user:" + accountInfo.accountAndUser.userId
+ " backoffTime was: " + authorityInfo.backoffTime
+ " backoffDelay was: " + authorityInfo.backoffDelay);
}
authorityInfo.backoffTime = NOT_IN_BACKOFF_MODE;
authorityInfo.backoffDelay = NOT_IN_BACKOFF_MODE;
syncQueue.onBackoffChanged(accountInfo.accountAndUser.account,
accountInfo.accountAndUser.userId, authorityInfo.authority, 0);
changed = true;
}
}
}