summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZheng Fu <zhengfu@google.com>2015-07-27 23:33:50 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-07-27 23:33:50 +0000
commitfb4b2705725087d21ee8e1289ff52169c6c58b0a (patch)
tree6099650b4012ee479179b236d1799398ec485144
parent1367ed0ed6e470218de3c0d5b8e2cf3575da4c74 (diff)
parent5a47ebdd14cc867da587e4a5a4f3ac923fbc9b57 (diff)
downloadpackages_providers_ContactsProvider-fb4b2705725087d21ee8e1289ff52169c6c58b0a.zip
packages_providers_ContactsProvider-fb4b2705725087d21ee8e1289ff52169c6c58b0a.tar.gz
packages_providers_ContactsProvider-fb4b2705725087d21ee8e1289ff52169c6c58b0a.tar.bz2
am 5a47ebdd: am ed6a10c2: am b049fb09: Default contact aggregator to ContactAggregator2.
* commit '5a47ebdd14cc867da587e4a5a4f3ac923fbc9b57': Default contact aggregator to ContactAggregator2.
-rw-r--r--src/com/android/providers/contacts/ContactsProvider2.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/providers/contacts/ContactsProvider2.java b/src/com/android/providers/contacts/ContactsProvider2.java
index 200c25c..7dc7e7e 100644
--- a/src/com/android/providers/contacts/ContactsProvider2.java
+++ b/src/com/android/providers/contacts/ContactsProvider2.java
@@ -1602,7 +1602,7 @@ public class ContactsProvider2 extends AbstractContactsProvider
ContactLocaleUtils.setLocales(mCurrentLocales);
int value = android.provider.Settings.Global.getInt(context.getContentResolver(),
- Global.NEW_CONTACT_AGGREGATOR, 0);
+ Global.NEW_CONTACT_AGGREGATOR, 1);
// Turn on aggregation algorithm updating process if new aggregator is enabled.
PROPERTY_AGGREGATION_ALGORITHM_VERSION = (value == 0)