am a640c49e: Merge change 22984 into eclair

Merge commit 'a640c49edafde3d00887d9c099b2d13b71f8b6d6' into eclair-plus-aosp

* commit 'a640c49edafde3d00887d9c099b2d13b71f8b6d6':
  fix AbstractThreadedSyncAdapter to actually cancel syncs

core/java/android/content/AbstractThreadedSyncAdapter.java

@@ -105,7 +105,8 @@ public abstract class AbstractThreadedSyncAdapter {
             // check it and when we use it
             synchronized (mSyncThreadLock) {
                 if (mSyncThread != null
-                        && mSyncThread.mSyncContext.getISyncContext() == syncContext) {
+                        && mSyncThread.mSyncContext.getISyncContext().asBinder()
+                        == syncContext.asBinder()) {
                     mSyncThread.interrupt();
                 }
             }