summaryrefslogtreecommitdiff
path: root/core/java
diff options
context:
space:
mode:
authorAndroid (Google) Code Review <android-gerrit@google.com>2009-08-31 18:51:04 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2009-08-31 18:51:04 -0700
commit34b6a27ea38adeea54a488efc6bbd04c58cb8a91 (patch)
tree0b07527f91202f436a36b3b745a99082b97819c9 /core/java
parente23ef1023a4e4bd91a68c41c81ba273656a2c3a7 (diff)
parentfcb14322f4afaf87b816ee120ad1e2f217b1350e (diff)
Merge change 23375 into eclair
* changes: re-enable cancelation of the sync thread upon receipt of ISyncAdapter.cancelSync()
Diffstat (limited to 'core/java')
-rw-r--r--core/java/android/content/AbstractThreadedSyncAdapter.java3
1 files changed, 1 insertions, 2 deletions
diff --git a/core/java/android/content/AbstractThreadedSyncAdapter.java b/core/java/android/content/AbstractThreadedSyncAdapter.java
index d17775e8a2c0..1edcb0a56ac2 100644
--- a/core/java/android/content/AbstractThreadedSyncAdapter.java
+++ b/core/java/android/content/AbstractThreadedSyncAdapter.java
@@ -111,8 +111,7 @@ public abstract class AbstractThreadedSyncAdapter {
if (mSyncThread != null
&& mSyncThread.mSyncContext.getISyncContext().asBinder()
== syncContext.asBinder()) {
- // TODO: figure out why canceling causes a hang
-// mSyncThread.interrupt();
+ mSyncThread.interrupt();
}
}
}