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

resolved conflicts for merge of 6421ae7e to master

Browse Source 
Change-Id: Ic8c4418f13a42fc1d3a44ad68e32b4e438b07f6f
This commit is contained in:
Dianne Hackborn
2010-09-13 21:41:57 -07:00
parent f86369ad0a 6421ae7eff
commit ade9916d5c
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1714,7 +1714,6 @@ public class SyncManager implements OnAccountsUpdateListener {
Log.v(TAG, "runStateIdle: setting mActiveSyncContext to " + mActiveSyncContext);
}
mSyncStorageEngine.setActiveSync(mActiveSyncContext);
mSyncWakeLock.setWorkSource(new WorkSource(syncAdapterInfo.uid));
if (!activeSyncContext.bindToSyncAdapter(syncAdapterInfo)) {
Log.e(TAG, "Bind attempt failed to " + syncAdapterInfo);
mActiveSyncContext.close();
@@ -1737,6 +1736,7 @@ public class SyncManager implements OnAccountsUpdateListener {
PowerManager.WakeLock oldWakeLock = mSyncWakeLock;
try {
mSyncWakeLock = getSyncWakeLock(op.account.type, op.authority);
mSyncWakeLock.setWorkSource(new WorkSource(syncAdapterInfo.uid));
mSyncWakeLock.acquire();
} finally {
if (oldWakeLock != null && oldWakeLock != mSyncWakeLock) {