Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a8f09b09 authored by Dave Santoro's avatar Dave Santoro Committed by Android (Google) Code Review
Browse files

Merge "Add data_set for Settings table as well."

parents 3adb1809 7c4479f3

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -16674,6 +16674,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";

core/java/android/provider/ContactsContract.java

+12 −0
Original line number Diff line number Diff line
@@ -7085,6 +7085,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.