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

am 5251c800: Merge "Fix potential crash in sync." into gingerbread

Browse Source 
Merge commit '5251c800c93c6f6fd473475c36b8ab3b360c1e4d' into gingerbread-plus-aosp

* commit '5251c800c93c6f6fd473475c36b8ab3b360c1e4d':
  Fix potential crash in sync.
This commit is contained in:
Dianne Hackborn
2010-09-13 17:26:34 -07:00
committed by Android Git Automerger
parent 527c02838b 5251c800c9
commit 6421ae7eff
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1696,16 +1696,17 @@ public class SyncManager implements OnAccountsUpdateListener {
Log.v(TAG, "runStateIdle: setting mActiveSyncContext to " + mActiveSyncContext); Log.v(TAG, "runStateIdle: setting mActiveSyncContext to " + mActiveSyncContext);
} }
mSyncStorageEngine.setActiveSync(mActiveSyncContext); mSyncStorageEngine.setActiveSync(mActiveSyncContext);
mSyncWakeLock.setWorkSource(new WorkSource(syncAdapterInfo.uid));
if (!activeSyncContext.bindToSyncAdapter(syncAdapterInfo)) { if (!activeSyncContext.bindToSyncAdapter(syncAdapterInfo)) {
Log.e(TAG, "Bind attempt failed to " + syncAdapterInfo); Log.e(TAG, "Bind attempt failed to " + syncAdapterInfo);
mActiveSyncContext.close(); mActiveSyncContext.close();
mActiveSyncContext = null; mActiveSyncContext = null;
mSyncStorageEngine.setActiveSync(mActiveSyncContext); mSyncStorageEngine.setActiveSync(mActiveSyncContext);
mSyncWakeLock.setWorkSource(null);
runStateIdle(); runStateIdle();
return; return;
} }
mSyncWakeLock.setWorkSource(new WorkSource(syncAdapterInfo.uid));
mSyncWakeLock.acquire(); mSyncWakeLock.acquire();
// no need to schedule an alarm, as that will be done by our caller. // no need to schedule an alarm, as that will be done by our caller.