diff options
| author | Dianne Hackborn <hackbod@google.com> | 2010-09-13 21:41:57 -0700 |
|---|---|---|
| committer | Dianne Hackborn <hackbod@google.com> | 2010-09-13 21:41:57 -0700 |
| commit | ade9916d5ca5795ced859a7d7405ef32140ccee8 (patch) | |
| tree | 0a93ab330bf553304a78530d422b866f120cc4e5 /core/java/android/content/SyncManager.java | |
| parent | f86369ad0adcbfc5c4b635d4475c237ee6134044 (diff) | |
| parent | 6421ae7eff277da7c0f84eb1cb78c2015ff04b25 (diff) | |
| download | frameworks_base-ade9916d5ca5795ced859a7d7405ef32140ccee8.zip frameworks_base-ade9916d5ca5795ced859a7d7405ef32140ccee8.tar.gz frameworks_base-ade9916d5ca5795ced859a7d7405ef32140ccee8.tar.bz2 | |
resolved conflicts for merge of 6421ae7e to master
Change-Id: Ic8c4418f13a42fc1d3a44ad68e32b4e438b07f6f
Diffstat (limited to 'core/java/android/content/SyncManager.java')
| -rw-r--r-- | core/java/android/content/SyncManager.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/content/SyncManager.java b/core/java/android/content/SyncManager.java index fee31ea..950d339 100644 --- a/core/java/android/content/SyncManager.java +++ b/core/java/android/content/SyncManager.java @@ -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) { |