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

Commit 257f7dcb authored by Liefu Liu's avatar Liefu Liu Committed by Android (Google) Code Review
Browse files

Merge "Rename ContactsContract.RawContacts.DefaultAccountAndState to... 

Merge "Rename ContactsContract.RawContacts.DefaultAccountAndState to ContactsContract.RawContacts.DefaultAccount.DefaultAccountAndState" into main
parents 24c37642 4632a57b

core/api/current.txt

+9 −5
Original line number Diff line number Diff line
@@ -36912,13 +36912,17 @@ package android.provider { 
    field public static final String CONTENT_DIRECTORY = "data";

  }













  @FlaggedApi("android.provider.new_default_account_api_enabled") public static final class ContactsContract.RawContacts.DefaultAccountAndState {













    ctor public ContactsContract.RawContacts.DefaultAccountAndState(int, @Nullable android.accounts.Account);













  @FlaggedApi("android.provider.new_default_account_api_enabled") public static final class ContactsContract.RawContacts.DefaultAccount {













    ctor public ContactsContract.RawContacts.DefaultAccount();













  }

























  @FlaggedApi("android.provider.new_default_account_api_enabled") public static final class ContactsContract.RawContacts.DefaultAccount.DefaultAccountAndState {













    ctor public ContactsContract.RawContacts.DefaultAccount.DefaultAccountAndState(int, @Nullable android.accounts.Account);















    method @Nullable public android.accounts.Account getCloudAccount();















    method public int getState();













    method @NonNull public static android.provider.ContactsContract.RawContacts.DefaultAccountAndState ofCloud(@NonNull android.accounts.Account);













    method @NonNull public static android.provider.ContactsContract.RawContacts.DefaultAccountAndState ofLocal();













    method @NonNull public static android.provider.ContactsContract.RawContacts.DefaultAccountAndState ofNotSet();













    method @NonNull public static android.provider.ContactsContract.RawContacts.DefaultAccount.DefaultAccountAndState ofCloud(@NonNull android.accounts.Account);













    method @NonNull public static android.provider.ContactsContract.RawContacts.DefaultAccount.DefaultAccountAndState ofLocal();













    method @NonNull public static android.provider.ContactsContract.RawContacts.DefaultAccount.DefaultAccountAndState ofNotSet();















    field public static final int DEFAULT_ACCOUNT_STATE_CLOUD = 3; // 0x3















    field public static final int DEFAULT_ACCOUNT_STATE_LOCAL = 2; // 0x2















    field public static final int DEFAULT_ACCOUNT_STATE_NOT_SET = 1; // 0x1

























core/java/android/provider/ContactsContract.java



+154
−143




























Original line number
Diff line number
Diff line








@@ -3018,6 +3018,16 @@ public final class ContactsContract {













                    com.android.internal.R.string.config_rawContactsLocalAccountType));















        }

























































        /**













         * Class containing utility methods around the default account.













         * New raw contacts requested to be inserted without a specified {@link Account} will be













         * saved in the default account.













         */













        @FlaggedApi(Flags.FLAG_NEW_DEFAULT_ACCOUNT_API_ENABLED)













        public static final class DefaultAccount {





























            /**















             * Represents the state of the default account, and the actual {@link Account} if it's















             * a cloud account.










@@ -3183,6 +3193,7 @@ public final class ContactsContract {













                public @interface DefaultAccountState {















                }















            }













        }































        /**















         * A sub-directory of a single raw contact that contains all of its