Merge change 23266 into eclair

* changes:
  disable canceling until the http connection code is understood

1 files changed, 2 insertions, 1 deletions

diff --git a/core/java/android/content/AbstractThreadedSyncAdapter.java b/core/java/android/content/AbstractThreadedSyncAdapter.java
index 1edcb0a56ac2..d17775e8a2c0 100644
--- a/core/java/android/content/AbstractThreadedSyncAdapter.java
+++ b/core/java/android/content/AbstractThreadedSyncAdapter.java
@@ -111,7 +111,8 @@ public abstract class AbstractThreadedSyncAdapter {
                 if (mSyncThread != null
                         && mSyncThread.mSyncContext.getISyncContext().asBinder()
                         == syncContext.asBinder()) {
-                    mSyncThread.interrupt();
+                    // TODO: figure out why canceling causes a hang
+//                    mSyncThread.interrupt();
                 }
             }
         }