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

Commit 00b01090 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "AccountManager copyAccountToUser move callback parameter to end" into main

parents 41b0c70a b84907d3

core/api/system-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -581,7 +581,7 @@ package android.accessibilityservice { 
package android.accounts {















  public class AccountManager {













    method @FlaggedApi("android.app.admin.flags.split_create_managed_profile_enabled") @NonNull @RequiresPermission(anyOf={android.Manifest.permission.COPY_ACCOUNTS, android.Manifest.permission.INTERACT_ACROSS_USERS_FULL}) public android.accounts.AccountManagerFuture<java.lang.Boolean> copyAccountToUser(@NonNull android.accounts.Account, @NonNull android.os.UserHandle, @NonNull android.os.UserHandle, @Nullable android.accounts.AccountManagerCallback<java.lang.Boolean>, @Nullable android.os.Handler);













    method @FlaggedApi("android.app.admin.flags.split_create_managed_profile_enabled") @NonNull @RequiresPermission(anyOf={android.Manifest.permission.COPY_ACCOUNTS, android.Manifest.permission.INTERACT_ACROSS_USERS_FULL}) public android.accounts.AccountManagerFuture<java.lang.Boolean> copyAccountToUser(@NonNull android.accounts.Account, @NonNull android.os.UserHandle, @NonNull android.os.UserHandle, @Nullable android.os.Handler, @Nullable android.accounts.AccountManagerCallback<java.lang.Boolean>);















    method @RequiresPermission(android.Manifest.permission.INTERACT_ACROSS_USERS_FULL) public android.accounts.AccountManagerFuture<android.os.Bundle> finishSessionAsUser(android.os.Bundle, android.app.Activity, android.os.UserHandle, android.accounts.AccountManagerCallback<android.os.Bundle>, android.os.Handler);















  }







































core/java/android/accounts/AccountManager.java



+4
−6




























Original line number
Diff line number
Diff line








@@ -30,7 +30,6 @@ import android.annotation.RequiresPermission;













import android.annotation.SdkConstant;















import android.annotation.SdkConstant.SdkConstantType;















import android.annotation.Size;













import android.annotation.SuppressLint;















import android.annotation.SystemApi;















import android.annotation.SystemService;















import android.annotation.UserHandleAware;










@@ -2019,23 +2018,22 @@ public class AccountManager {













     * @param account the account to copy















     * @param fromUser the user to copy the account from















     * @param toUser the target user













     * @param callback Callback to invoke when the request completes,













     *     null for no callback















     * @param handler {@link Handler} identifying the callback thread,















     *     null for the main thread













     * @param callback Callback to invoke when the request completes,













     *     null for no callback















     * @return An {@link AccountManagerFuture} which resolves to a Boolean indicated whether it















     * succeeded.















     * @hide















     */













    @SuppressLint("SamShouldBeLast")















    @NonNull















    @SystemApi















    @RequiresPermission(anyOf = {COPY_ACCOUNTS, INTERACT_ACROSS_USERS_FULL})















    @FlaggedApi(FLAG_SPLIT_CREATE_MANAGED_PROFILE_ENABLED)















    public AccountManagerFuture<Boolean> copyAccountToUser(















            @NonNull final Account account, @NonNull final UserHandle fromUser,













            @NonNull final UserHandle toUser, @Nullable AccountManagerCallback<Boolean> callback,













            @Nullable Handler handler) {













            @NonNull final UserHandle toUser, @Nullable Handler handler,













            @Nullable AccountManagerCallback<Boolean> callback) {















        if (account == null) throw new IllegalArgumentException("account is null");















        if (toUser == null || fromUser == null) {















            throw new IllegalArgumentException("fromUser and toUser cannot be null");

































services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java



+1
−1




























Original line number
Diff line number
Diff line








@@ -21907,7 +21907,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {













                    accountToMigrate,















                    sourceUser,















                    targetUser,













                    /* callback= */ null, /* handler= */ null)













                    /* handler= */ null, /* callback= */ null)















                    .getResult(60 * 3, TimeUnit.SECONDS);















            if (copySucceeded) {















                logCopyAccountStatus(COPY_ACCOUNT_SUCCEEDED, callerPackage);