am eb59a87a: Merge "Add CollectionUtils class to create generic collection easily" into jb-mr1-dev

* commit 'eb59a87a074348d30191e57308221531ae613001':
  Add CollectionUtils class to create generic collection easily

1 files changed, 7 insertions, 6 deletions

diff --git a/java/src/com/android/inputmethod/research/ResearchLogger.java b/java/src/com/android/inputmethod/research/ResearchLogger.java
index 24535ee13..2b2735060 100644
--- a/java/src/com/android/inputmethod/research/ResearchLogger.java
+++ b/java/src/com/android/inputmethod/research/ResearchLogger.java
@@ -57,6 +57,7 @@ import com.android.inputmethod.keyboard.KeyboardId;
 import com.android.inputmethod.keyboard.KeyboardSwitcher;
 import com.android.inputmethod.keyboard.KeyboardView;
 import com.android.inputmethod.keyboard.MainKeyboardView;
+import com.android.inputmethod.latin.CollectionUtils;
 import com.android.inputmethod.latin.Constants;
 import com.android.inputmethod.latin.Dictionary;
 import com.android.inputmethod.latin.LatinIME;
@@ -115,7 +116,7 @@ public class ResearchLogger implements SharedPreferences.OnSharedPreferenceChang
     // the system to do so.
     /* package */ ResearchLog mIntentionalResearchLog;
     // LogUnits are queued here and released only when the user requests the intentional log.
-    private List<LogUnit> mIntentionalResearchLogQueue = new ArrayList<LogUnit>();
+    private List<LogUnit> mIntentionalResearchLogQueue = CollectionUtils.newArrayList();
 
     private boolean mIsPasswordView = false;
     private boolean mIsLoggingSuspended = false;
@@ -514,7 +515,7 @@ public class ResearchLogger implements SharedPreferences.OnSharedPreferenceChang
     private void saveLogsForFeedback() {
         mFeedbackLog = mIntentionalResearchLog;
         if (mIntentionalResearchLogQueue != null) {
-            mFeedbackQueue = new ArrayList<LogUnit>(mIntentionalResearchLogQueue);
+            mFeedbackQueue = CollectionUtils.newArrayList(mIntentionalResearchLogQueue);
         } else {
             mFeedbackQueue = null;
         }
@@ -524,7 +525,7 @@ public class ResearchLogger implements SharedPreferences.OnSharedPreferenceChang
 
         mMainResearchLog = null;
         mIntentionalResearchLog = null;
-        mIntentionalResearchLogQueue = new ArrayList<LogUnit>();
+        mIntentionalResearchLogQueue = CollectionUtils.newArrayList();
     }
 
     private static final int LOG_DRAIN_TIMEOUT_IN_MS = 1000 * 5;
@@ -781,9 +782,9 @@ public class ResearchLogger implements SharedPreferences.OnSharedPreferenceChang
     }
 
     static class LogUnit {
-        private final List<String[]> mKeysList = new ArrayList<String[]>();
-        private final List<Object[]> mValuesList = new ArrayList<Object[]>();
-        private final List<Boolean> mIsPotentiallyPrivate = new ArrayList<Boolean>();
+        private final List<String[]> mKeysList = CollectionUtils.newArrayList();
+        private final List<Object[]> mValuesList = CollectionUtils.newArrayList();
+        private final List<Boolean> mIsPotentiallyPrivate = CollectionUtils.newArrayList();
 
         private void addLogAtom(final String[] keys, final Object[] values,
                 final Boolean isPotentiallyPrivate) {