From feeb1e3adac000f36e1e7a5d754ad6b4e3ab34c1 Mon Sep 17 00:00:00 2001
From: Tony Mantler <nicoya@google.com>
Date: Tue, 18 Feb 2014 15:59:03 -0800
Subject: [PATCH] Mark otherwise unused method as @VisibleForTesting

Also fix spelling cancellAllInterrupt -> cancelAllInterrupt

b/13082964

Change-Id: I2fef949bb351a536fdd0d7058b3df2b03eecb39e
---
 .../android/emailcommon/utility/EmailAsyncTask.java   | 11 +++++++----
 .../emailcommon/utility/EmailAsyncTaskTests.java      |  4 +---
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/emailcommon/src/com/android/emailcommon/utility/EmailAsyncTask.java b/emailcommon/src/com/android/emailcommon/utility/EmailAsyncTask.java
index 3d2e69cfb..e0db42789 100644
--- a/emailcommon/src/com/android/emailcommon/utility/EmailAsyncTask.java
+++ b/emailcommon/src/com/android/emailcommon/utility/EmailAsyncTask.java
@@ -18,6 +18,8 @@ package com.android.emailcommon.utility;
 
 import android.os.AsyncTask;
 
+import com.google.common.annotations.VisibleForTesting;
+
 import java.util.ArrayList;
 import java.util.LinkedList;
 import java.util.concurrent.ExecutionException;
@@ -31,7 +33,7 @@ import java.util.concurrent.Executor;
  *   in onDestroy() or similar places.
  * - Instead of {@link AsyncTask#onPostExecute}, it has {@link #onSuccess(Object)}, as the
  *   regular {@link AsyncTask#onPostExecute} is a bit hard to predict when it'll be called and
- *   whel it won't.
+ *   when it won't.
  *
  * Note this class is missing some of the {@link AsyncTask} features, e.g. it lacks
  * {@link AsyncTask#onProgressUpdate}.  Add these when necessary.
@@ -43,7 +45,7 @@ public abstract class EmailAsyncTask<Params, Progress, Result> {
     /**
      * Tracks {@link EmailAsyncTask}.
      *
-     * Call {@link #cancellAllInterrupt()} to cancel all tasks registered.
+     * Call {@link #cancelAllInterrupt()} to cancel all tasks registered.
      */
     public static class Tracker {
         private final LinkedList<EmailAsyncTask<?, ?, ?>> mTasks =
@@ -64,7 +66,8 @@ public abstract class EmailAsyncTask<Params, Progress, Result> {
         /**
          * Cancel all registered tasks.
          */
-        public void cancellAllInterrupt() {
+        @VisibleForTesting
+        public void cancelAllInterrupt() {
             synchronized (mTasks) {
                 for (EmailAsyncTask<?, ?, ?> task : mTasks) {
                     task.cancel(true);
@@ -212,7 +215,7 @@ public abstract class EmailAsyncTask<Params, Progress, Result> {
         return executeInternal(SERIAL_EXECUTOR, true, params);
     }
 
-    private final EmailAsyncTask<Params, Progress, Result> executeInternal(Executor executor,
+    private EmailAsyncTask<Params, Progress, Result> executeInternal(Executor executor,
             boolean cancelPrevious, Params... params) {
         if (cancelPrevious) {
             if (mTracker == null) {
diff --git a/tests/src/com/android/emailcommon/utility/EmailAsyncTaskTests.java b/tests/src/com/android/emailcommon/utility/EmailAsyncTaskTests.java
index 1413e9f5e..41064aac5 100644
--- a/tests/src/com/android/emailcommon/utility/EmailAsyncTaskTests.java
+++ b/tests/src/com/android/emailcommon/utility/EmailAsyncTaskTests.java
@@ -16,8 +16,6 @@
 
 package com.android.emailcommon.utility;
 
-import com.android.emailcommon.utility.EmailAsyncTask.Tracker;
-
 import android.test.AndroidTestCase;
 import android.test.MoreAsserts;
 
@@ -70,7 +68,7 @@ public class EmailAsyncTaskTests extends AndroidTestCase {
         // Task 2 and 4 are still registered.
 
         // Cancel all left
-        tracker.cancellAllInterrupt();
+        tracker.cancelAllInterrupt();
 
         // Check if they're canceled
         assertEquals(0, tracker.getTaskCountForTest());