diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2013-07-30 22:24:15 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2013-07-30 22:24:15 +0000 |
| commit | f2d643cfc7405c1f771cacab365a0a5d9b547f36 (patch) | |
| tree | 0f8997603b80060e07f0b1ba069e01ee6c908db1 | |
| parent | bfe1b801831ce875a164ad95a07ab03c307e986e (diff) | |
| parent | 8014cbffad1e74814ddd0a98ee5954d8bf3a6c03 (diff) | |
| download | base-f2d643cfc7405c1f771cacab365a0a5d9b547f36.tar.gz | |
Merge "Fixed a leaked partial wakelock in AbstractThreadedSyncAdapter."
| -rw-r--r-- | core/java/android/content/AbstractThreadedSyncAdapter.java | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/core/java/android/content/AbstractThreadedSyncAdapter.java b/core/java/android/content/AbstractThreadedSyncAdapter.java index bafe67d619f3..898cc4e7a1e2 100644 --- a/core/java/android/content/AbstractThreadedSyncAdapter.java +++ b/core/java/android/content/AbstractThreadedSyncAdapter.java @@ -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( |