commit e0cbda454cdf0c78f08be1c5cfec4d02bbb55867
author Tingting Wang <tingtingw@google.com> Tue May 10 15:39:37 2016 -0700
committer Tingting Wang <tingtingw@google.com> Tue May 10 17:29:00 2016 -0700
tree 8bfe8259350fd208ccfa75bad84852f4aeafb04e
parent de66540fd3f73937c3cfbe1d50e575aa69acc474

Rename CONTACT_METADATA_SYNC GService Flag.

Rename it to CONTACT_METADATA_SYNC_ENABLED.

BUG 28295805

Change-Id: Ib1f735b082a2ff6cca93e377b3eaaaf7cd396b8d

api/current.txt

diff --git a/api/current.txt b/api/current.txt
index d380e70..86a4872 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -32441,7 +32441,7 @@
     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";

api/removed.txt

diff --git a/api/removed.txt b/api/removed.txt
index f9fce40..18cc33a 100644
--- a/api/removed.txt
+++ b/api/removed.txt
@@ -356,6 +356,10 @@
     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";

api/system-current.txt

diff --git a/api/system-current.txt b/api/system-current.txt
index dbbefbf..f493804 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -35140,7 +35140,7 @@
     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";

api/system-removed.txt

diff --git a/api/system-removed.txt b/api/system-removed.txt
index 6897ce0..598afb8 100644
--- a/api/system-removed.txt
+++ b/api/system-removed.txt
@@ -354,6 +354,10 @@
     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";

api/test-current.txt

diff --git a/api/test-current.txt b/api/test-current.txt
index acd7299..c80d6a0 100644
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -32514,7 +32514,7 @@
     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";

api/test-removed.txt

diff --git a/api/test-removed.txt b/api/test-removed.txt
index f9fce40..18cc33a 100644
--- a/api/test-removed.txt
+++ b/api/test-removed.txt
@@ -356,6 +356,10 @@
     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";