From e0cbda454cdf0c78f08be1c5cfec4d02bbb55867 Mon Sep 17 00:00:00 2001 From: Tingting Wang Date: Tue, 10 May 2016 15:39:37 -0700 Subject: [PATCH] Rename CONTACT_METADATA_SYNC GService Flag. Rename it to CONTACT_METADATA_SYNC_ENABLED. BUG 28295805 Change-Id: Ib1f735b082a2ff6cca93e377b3eaaaf7cd396b8d --- api/current.txt | 2 +- api/removed.txt | 4 ++++ api/system-current.txt | 2 +- api/system-removed.txt | 4 ++++ api/test-current.txt | 2 +- api/test-removed.txt | 4 ++++ core/java/android/provider/Settings.java | 9 +++++++++ 7 files changed, 24 insertions(+), 3 deletions(-) diff --git a/api/current.txt b/api/current.txt index d380e70d6a019..86a4872236349 100644 --- a/api/current.txt +++ b/api/current.txt @@ -32441,7 +32441,7 @@ package android.provider { field public static final java.lang.String AUTO_TIME_ZONE = "auto_time_zone"; field public static final java.lang.String BLUETOOTH_ON = "bluetooth_on"; field public static final java.lang.String BOOT_COUNT = "boot_count"; - field public static final java.lang.String CONTACT_METADATA_SYNC = "contact_metadata_sync"; + field public static final java.lang.String CONTACT_METADATA_SYNC_ENABLED = "contact_metadata_sync_enabled"; field public static final android.net.Uri CONTENT_URI; field public static final java.lang.String DATA_ROAMING = "data_roaming"; field public static final java.lang.String DEBUG_APP = "debug_app"; diff --git a/api/removed.txt b/api/removed.txt index f9fce40f642db..18cc33a3b3681 100644 --- a/api/removed.txt +++ b/api/removed.txt @@ -356,6 +356,10 @@ package android.provider { field public static final deprecated java.lang.String TIMESTAMP = "timestamp"; } + public static final class Settings.Global extends android.provider.Settings.NameValueTable { + field public static final deprecated java.lang.String CONTACT_METADATA_SYNC = "contact_metadata_sync"; + } + public static final class Settings.System extends android.provider.Settings.NameValueTable { field public static final java.lang.String APPEND_FOR_LAST_AUDIBLE = "_last_audible"; field public static final java.lang.String VOLUME_ALARM = "volume_alarm"; diff --git a/api/system-current.txt b/api/system-current.txt index dbbefbf934cb4..f493804a6853d 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -35140,7 +35140,7 @@ package android.provider { field public static final java.lang.String AUTO_TIME_ZONE = "auto_time_zone"; field public static final java.lang.String BLUETOOTH_ON = "bluetooth_on"; field public static final java.lang.String BOOT_COUNT = "boot_count"; - field public static final java.lang.String CONTACT_METADATA_SYNC = "contact_metadata_sync"; + field public static final java.lang.String CONTACT_METADATA_SYNC_ENABLED = "contact_metadata_sync_enabled"; field public static final android.net.Uri CONTENT_URI; field public static final java.lang.String DATA_ROAMING = "data_roaming"; field public static final java.lang.String DEBUG_APP = "debug_app"; diff --git a/api/system-removed.txt b/api/system-removed.txt index 6897ce0571aac..598afb8b3a614 100644 --- a/api/system-removed.txt +++ b/api/system-removed.txt @@ -354,6 +354,10 @@ package android.provider { field public static final deprecated java.lang.String TIMESTAMP = "timestamp"; } + public static final class Settings.Global extends android.provider.Settings.NameValueTable { + field public static final deprecated java.lang.String CONTACT_METADATA_SYNC = "contact_metadata_sync"; + } + public static final class Settings.System extends android.provider.Settings.NameValueTable { field public static final java.lang.String APPEND_FOR_LAST_AUDIBLE = "_last_audible"; field public static final java.lang.String VOLUME_ALARM = "volume_alarm"; diff --git a/api/test-current.txt b/api/test-current.txt index acd729913df0d..c80d6a016c9ee 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -32514,7 +32514,7 @@ package android.provider { field public static final java.lang.String AUTO_TIME_ZONE = "auto_time_zone"; field public static final java.lang.String BLUETOOTH_ON = "bluetooth_on"; field public static final java.lang.String BOOT_COUNT = "boot_count"; - field public static final java.lang.String CONTACT_METADATA_SYNC = "contact_metadata_sync"; + field public static final java.lang.String CONTACT_METADATA_SYNC_ENABLED = "contact_metadata_sync_enabled"; field public static final android.net.Uri CONTENT_URI; field public static final java.lang.String DATA_ROAMING = "data_roaming"; field public static final java.lang.String DEBUG_APP = "debug_app"; diff --git a/api/test-removed.txt b/api/test-removed.txt index f9fce40f642db..18cc33a3b3681 100644 --- a/api/test-removed.txt +++ b/api/test-removed.txt @@ -356,6 +356,10 @@ package android.provider { field public static final deprecated java.lang.String TIMESTAMP = "timestamp"; } + public static final class Settings.Global extends android.provider.Settings.NameValueTable { + field public static final deprecated java.lang.String CONTACT_METADATA_SYNC = "contact_metadata_sync"; + } + public static final class Settings.System extends android.provider.Settings.NameValueTable { field public static final java.lang.String APPEND_FOR_LAST_AUDIBLE = "_last_audible"; field public static final java.lang.String VOLUME_ALARM = "volume_alarm"; diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 370cd5722347c..7b4be71236971 100755 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -8875,9 +8875,18 @@ 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