use new setting flag to switch between current and new aggregator.

In order for the switch, add AbstractContactAggregator for
ContactAggregator and ContactAggregator2.

Bug:20055573
Change-Id: I6f27d4df8017938b226f5c6371b15ba41fd18acd

1 files changed, 4 insertions, 4 deletions

diff --git a/src/com/android/providers/contacts/aggregation/util/RawContactMatchingCandidates.java b/src/com/android/providers/contacts/aggregation/util/RawContactMatchingCandidates.java
index 39125b44..917c810c 100644
--- a/src/com/android/providers/contacts/aggregation/util/RawContactMatchingCandidates.java
+++ b/src/com/android/providers/contacts/aggregation/util/RawContactMatchingCandidates.java
@@ -29,25 +29,25 @@ import static com.android.internal.util.Preconditions.checkNotNull;
  * Matching candidates for a raw contact, used in the contact aggregator.
  */
 public class RawContactMatchingCandidates {
-    private List<RawContactMatcher.MatchScore> mBestMatches;
+    private List<MatchScore> mBestMatches;
     private Set<Long> mRawContactIds = null;
     private Map<Long, Long> mRawContactToContact = null;
     private Map<Long, Long> mRawContactToAccount = null;
 
-    public RawContactMatchingCandidates(List<RawContactMatcher.MatchScore> mBestMatches) {
+    public RawContactMatchingCandidates(List<MatchScore> mBestMatches) {
         checkNotNull(mBestMatches);
         this.mBestMatches = mBestMatches;
     }
 
     public RawContactMatchingCandidates() {
-        mBestMatches = new ArrayList<RawContactMatcher.MatchScore>();
+        mBestMatches = new ArrayList<MatchScore>();
     }
 
     public int getCount() {
         return mBestMatches.size();
     }
 
-    public void add(RawContactMatcher.MatchScore score) {
+    public void add(MatchScore score) {
         mBestMatches.add(score);
         if (mRawContactIds != null) {
             mRawContactIds.add(score.getRawContactId());