summaryrefslogtreecommitdiff
path: root/core/java
diff options
context:
space:
mode:
authorTingting Wang <tingtingw@google.com>2016-05-12 17:11:42 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2016-05-12 17:11:44 +0000
commit752129929fcbe8d7740d25014f7878e835d4f4ef (patch)
tree1216383387820894982e12083ccd94e88c5f007c /core/java
parent8a68194477cf938c55bbf7e36509c689d6a54b32 (diff)
parente0cbda454cdf0c78f08be1c5cfec4d02bbb55867 (diff)
Merge "Rename CONTACT_METADATA_SYNC GService Flag." into nyc-dev
Diffstat (limited to 'core/java')
-rwxr-xr-xcore/java/android/provider/Settings.java9
1 files changed, 9 insertions, 0 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java
index 370cd5722347..7b4be7123697 100755
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -8875,10 +8875,19 @@ public final class Settings {
/**
* Whether to enable contacts metadata syncing or not
* The value 1 - enable, 0 - disable
+ *
+ * @removed
*/
+ @Deprecated
public static final String CONTACT_METADATA_SYNC = "contact_metadata_sync";
/**
+ * Whether to enable contacts metadata syncing or not
+ * The value 1 - enable, 0 - disable
+ */
+ public static final String CONTACT_METADATA_SYNC_ENABLED = "contact_metadata_sync_enabled";
+
+ /**
* Whether to enable cellular on boot.
* The value 1 - enable, 0 - disable
* @hide