Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 34b6a27e authored by Android (Google) Code Review's avatar Android (Google) Code Review
Browse files

Merge change 23375 into eclair 

* changes:
  re-enable cancelation of the sync thread upon receipt of ISyncAdapter.cancelSync()
parents e23ef102 fcb14322

core/java/android/content/AbstractThreadedSyncAdapter.java

+1 −2
Original line number Diff line number Diff line
@@ -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();

                }

            }

        }