Roll out new aggregator to limited dogfooders.

Bug:19908937
Change-Id: I77e09aac3c60c60882f508a637225a4dc478a2ce

1 files changed, 8 insertions, 0 deletions

diff --git a/tests/src/com/android/providers/contacts/aggregation/ContactAggregatorTest.java b/tests/src/com/android/providers/contacts/aggregation/ContactAggregatorTest.java
index 58a7a6e..3b59cdb 100644
--- a/tests/src/com/android/providers/contacts/aggregation/ContactAggregatorTest.java
+++ b/tests/src/com/android/providers/contacts/aggregation/ContactAggregatorTest.java
@@ -37,6 +37,7 @@ import android.test.MoreAsserts;
 import android.test.suitebuilder.annotation.MediumTest;
 
 import com.android.providers.contacts.BaseContactsProvider2Test;
+import com.android.providers.contacts.ContactsProvider2;
 import com.android.providers.contacts.TestUtils;
 import com.android.providers.contacts.tests.R;
 import com.android.providers.contacts.testutil.DataUtil;
@@ -67,6 +68,13 @@ public class ContactAggregatorTest extends BaseContactsProvider2Test {
             AggregationExceptions.RAW_CONTACT_ID2
     };
 
+    protected void setUp() throws Exception {
+        super.setUp();
+        final ContactsProvider2 cp = (ContactsProvider2) getProvider();
+        // Make sure to use ContactAggregator.java class
+        cp.setNewAggregatorForTest(false);
+    }
+
     public void testCrudAggregationExceptions() throws Exception {
         long rawContactId1 = RawContactUtil.createRawContactWithName(mResolver, "zz", "top");
         long rawContactId2 = RawContactUtil.createRawContactWithName(mResolver, "aa", "bottom");