Merge "Rename CONTACT_METADATA_SYNC GService Flag." into nyc-dev

7 files changed, 24 insertions, 3 deletions

diff --git a/api/current.txt b/api/current.txt
index a0bddb02f7eb..e1569f1a5b9d 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -32342,7 +32342,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 2673a829cacd..0db555f9f102 100644
--- a/api/removed.txt
+++ b/api/removed.txt
@@ -387,6 +387,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 65526970a172..55f8b6f7de4d 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -35041,7 +35041,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 7f2c2d6c6199..5f9d3502fb01 100644
--- a/api/system-removed.txt
+++ b/api/system-removed.txt
@@ -385,6 +385,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 3aeb6c70504d..1376ef1af8b9 100644
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -32414,7 +32414,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 2673a829cacd..0db555f9f102 100644
--- a/api/test-removed.txt
+++ b/api/test-removed.txt
@@ -387,6 +387,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 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