From 7c4479f3c9dfdbfa7ee09d4f05dc054b35b87e98 Mon Sep 17 00:00:00 2001
From: Dave Santoro <dsantoro@google.com>
Date: Wed, 7 Sep 2011 16:52:27 -0700
Subject: Add data_set for Settings table as well.

Bug 5156004

Change-Id: Iac0eac2a8a6c3994ba3188e571e39717dcb673e1
---
 api/current.txt                                  |  1 +
 core/java/android/provider/ContactsContract.java | 12 ++++++++++++
 2 files changed, 13 insertions(+)

diff --git a/api/current.txt b/api/current.txt
index f8b7bd9ffc6b..981c7149b6a8 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -16672,6 +16672,7 @@ package android.provider {
     field public static final java.lang.String ACCOUNT_NAME = "account_name";
     field public static final java.lang.String ACCOUNT_TYPE = "account_type";
     field public static final java.lang.String ANY_UNSYNCED = "any_unsynced";
+    field public static final java.lang.String DATA_SET = "data_set";
     field public static final java.lang.String SHOULD_SYNC = "should_sync";
     field public static final java.lang.String UNGROUPED_COUNT = "summ_count";
     field public static final java.lang.String UNGROUPED_VISIBLE = "ungrouped_visible";
diff --git a/core/java/android/provider/ContactsContract.java b/core/java/android/provider/ContactsContract.java
index 1f2b3429f3f8..949bf15022a9 100644
--- a/core/java/android/provider/ContactsContract.java
+++ b/core/java/android/provider/ContactsContract.java
@@ -7052,6 +7052,18 @@ public final class ContactsContract {
          */
         public static final String ACCOUNT_TYPE = "account_type";
 
+        /**
+         * The data set within the account that this row belongs to.  This allows
+         * multiple sync adapters for the same account type to distinguish between
+         * each others' data.
+         *
+         * This is empty by default, and is completely optional.  It only needs to
+         * be populated if multiple sync adapters are entering distinct data for
+         * the same account type and account name.
+         * <P>Type: TEXT</P>
+         */
+        public static final String DATA_SET = "data_set";
+
         /**
          * Depending on the mode defined by the sync-adapter, this flag controls
          * the top-level sync behavior for this data source.
-- 
cgit v1.2.3-59-g8ed1b