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

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

Merge "Mark the API of Settings.getDefaultAccount and... 

Merge "Mark the API of Settings.getDefaultAccount and Settings.setDefaultAccount as deprecated." into main
parents 191d62fb bfddac85

core/api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -37296,7 +37296,7 @@ package android.provider { 
  }















  public static final class ContactsContract.Settings implements android.provider.ContactsContract.SettingsColumns {













    method @Nullable public static android.accounts.Account getDefaultAccount(@NonNull android.content.ContentResolver);













    method @Deprecated @FlaggedApi("android.provider.new_default_account_api_enabled") @Nullable public static android.accounts.Account getDefaultAccount(@NonNull android.content.ContentResolver);















    field public static final String ACTION_SET_DEFAULT_ACCOUNT = "android.provider.action.SET_DEFAULT_ACCOUNT";















    field public static final String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/setting";















    field public static final String CONTENT_TYPE = "vnd.android.cursor.dir/setting";

























core/api/system-current.txt



+1
−1






























Original line number
Diff line number
Diff line








@@ -12110,7 +12110,7 @@ package android.provider {













  }





























  public static final class ContactsContract.Settings implements android.provider.ContactsContract.SettingsColumns {













    method @RequiresPermission(android.Manifest.permission.SET_DEFAULT_ACCOUNT_FOR_CONTACTS) public static void setDefaultAccount(@NonNull android.content.ContentResolver, @Nullable android.accounts.Account);













    method @Deprecated @FlaggedApi("android.provider.new_default_account_api_enabled") @RequiresPermission(android.Manifest.permission.SET_DEFAULT_ACCOUNT_FOR_CONTACTS) public static void setDefaultAccount(@NonNull android.content.ContentResolver, @Nullable android.accounts.Account);















  }





























  public static final class ContactsContract.SimContacts {

























core/java/android/provider/ContactsContract.java



+14
−0






























Original line number
Diff line number
Diff line








@@ -9383,7 +9383,14 @@ public final class ContactsContract {













         * @param resolver the ContentResolver to query.















         * @return the default account for new contacts, or null if it's not set or set to NULL















         * account.













         *













         * @deprecated This API is only supported up to Android version













         *      * {@link Build.VERSION_CODES#VANILLA_ICE_CREAM}. On later versions,













         * {@link ContactsContract.RawContacts.DefaultAccount#getDefaultAccountForNewContacts}













         * should be used.















         */













        @Deprecated













        @FlaggedApi(Flags.FLAG_NEW_DEFAULT_ACCOUNT_API_ENABLED)















        @Nullable















        public static Account getDefaultAccount(@NonNull ContentResolver resolver) {















            Bundle response = resolver.call(ContactsContract.AUTHORITY_URI,









@@ -9404,7 +9411,14 @@ public final class ContactsContract {













         * @param resolver the ContentResolver to query.















         * @param account the account to be set to default.















         * @hide













         *













         * @deprecated This API is only supported up to Android version













         *      * {@link Build.VERSION_CODES#VANILLA_ICE_CREAM}. On later versions,













         * {@link ContactsContract.RawContacts.DefaultAccount#setDefaultAccountForNewContacts}













         * should be used.















         */













        @Deprecated













        @FlaggedApi(Flags.FLAG_NEW_DEFAULT_ACCOUNT_API_ENABLED)















        @SystemApi















        @RequiresPermission(android.Manifest.permission.SET_DEFAULT_ACCOUNT_FOR_CONTACTS)















        public static void setDefaultAccount(@NonNull ContentResolver resolver,