summaryrefslogtreecommitdiff
path: root/core/java
diff options
context:
space:
mode:
authorZheng Fu <zhengfu@google.com>2015-04-14 19:36:41 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-04-14 19:36:43 +0000
commit5929b7b8f0d97ac30404ee699e4da7ad444314a9 (patch)
tree494fd2495d2788a37cfd71b9654236d01fd1242f /core/java
parentca25b8768d1946dbdc3b84fe54b7c4b2888529de (diff)
parentb218ff49fd2f6b53dcf6a740fba1550a986a25f8 (diff)
Merge "Add setting flag to enable new contact aggregator"
Diffstat (limited to 'core/java')
-rw-r--r--core/java/android/provider/Settings.java7
1 files changed, 7 insertions, 0 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java
index 9edf6ad42b20..109c23be4ff2 100644
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -7717,6 +7717,13 @@ public final class Settings {
*/
public static final String[] MULTI_SIM_USER_PREFERRED_SUBS = {"user_preferred_sub1",
"user_preferred_sub2","user_preferred_sub3"};
+
+ /**
+ * Whether to enable new contacts aggregator or not.
+ * The value 1 - enable, 0 - disable
+ * @hide
+ */
+ public static final String NEW_CONTACT_AGGREGATOR = "new_contact_aggregator";
}
/**