am f2d643cf: Merge "Fixed a leaked partial wakelock in AbstractThreadedSyncAdapter."

* commit 'f2d643cfc7405c1f771cacab365a0a5d9b547f36':
  Fixed a leaked partial wakelock in AbstractThreadedSyncAdapter.
This commit is contained in:
Jean-Baptiste Queru
2013-07-30 15:32:19 -07:00
committed by Android Git Automerger

View File

@@ -160,10 +160,13 @@ public abstract class AbstractThreadedSyncAdapter {
if (mAutoInitialize
&& extras != null
&& extras.getBoolean(ContentResolver.SYNC_EXTRAS_INITIALIZE, false)) {
if (ContentResolver.getIsSyncable(account, authority) < 0) {
ContentResolver.setIsSyncable(account, authority, 1);
try {
if (ContentResolver.getIsSyncable(account, authority) < 0) {
ContentResolver.setIsSyncable(account, authority, 1);
}
} finally {
syncContextClient.onFinished(new SyncResult());
}
syncContextClient.onFinished(new SyncResult());
return;
}
SyncThread syncThread = new SyncThread(