some changes due to an API review

 - make EntityIterator extend Iterator and thus not throw a
   RemoteException, instead converting it into a RuntimeException.
 - rename ActiveSyncInfo to SyncInfo
 - change getActiveSync to getCurrentSync
 - remove the accessors in SyncInfo and instead make the final
   fields publicly accessible
 - made AbstractThreadedSyncAdapter.cancelSync not take a thread

Change-Id: I99fde5585bc5f1e95f4873ffbba189074a8d6372
http://b/issue?id=2553539
http://b/issue?id=2553541
http://b/issue?id=2553550

1 files changed, 14 insertions, 10 deletions

diff --git a/core/java/android/content/AbstractThreadedSyncAdapter.java b/core/java/android/content/AbstractThreadedSyncAdapter.java
index 14bc5dd..9dd7b9f 100644
--- a/core/java/android/content/AbstractThreadedSyncAdapter.java
+++ b/core/java/android/content/AbstractThreadedSyncAdapter.java
@@ -17,12 +17,10 @@
 package android.content;
 
 import android.accounts.Account;
-import android.net.TrafficStats;
 import android.os.Bundle;
 import android.os.IBinder;
 import android.os.Process;
 import android.os.RemoteException;
-import android.util.EventLog;
 
 import java.util.concurrent.atomic.AtomicInteger;
 
@@ -113,12 +111,13 @@ public abstract class AbstractThreadedSyncAdapter {
         public void cancelSync(ISyncContext syncContext) {
             // synchronize to make sure that mSyncThread doesn't change between when we
             // check it and when we use it
+            final SyncThread syncThread;
             synchronized (mSyncThreadLock) {
-                if (mSyncThread != null
-                        && mSyncThread.mSyncContext.getSyncContextBinder()
-                        == syncContext.asBinder()) {
-                    onSyncCanceled(mSyncThread);
-                }
+                syncThread = mSyncThread;
+            }
+            if (syncThread != null
+                    && syncThread.mSyncContext.getSyncContextBinder() == syncContext.asBinder()) {
+                onSyncCanceled();
             }
         }
 
@@ -213,9 +212,14 @@ public abstract class AbstractThreadedSyncAdapter {
      * thread than the sync thread and so you must consider the multi-threaded implications
      * of the work that you do in this method.
      *
-     * @param thread the thread that is running the sync operation to cancel
      */
-    public void onSyncCanceled(Thread thread) {
-        thread.interrupt();
+    public void onSyncCanceled() {
+        final SyncThread syncThread;
+        synchronized (mSyncThreadLock) {
+            syncThread = mSyncThread;
+        }
+        if (syncThread != null) {
+            syncThread.interrupt();
+        }
     }
 }