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

Commit 5f1e1e4b authored by Nupur Saxena's avatar Nupur Saxena Committed by Android (Google) Code Review
Browse files

Merge "Migrate and remove account from calling user in headless mode"

parents 49f9499e 64d90cd7

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

+5 −4
Original line number Diff line number Diff line
@@ -21599,7 +21599,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { 
        }

        copyAccount(targetUser, sourceUser, accountToMigrate, callerPackage);

        if (!keepAccountMigrated) {

            removeAccount(accountToMigrate);

            removeAccount(accountToMigrate, sourceUserId);

        }

    }










@@ -21643,9 +21643,10 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {













                .write();















    }



























    private void removeAccount(Account account) {













        final AccountManager accountManager =













                mContext.getSystemService(AccountManager.class);













    private void removeAccount(Account account, @UserIdInt int sourceUserId) {













        final AccountManager accountManager = mContext.createContextAsUser(













                        UserHandle.of(sourceUserId), /* flags= */ 0)













                .getSystemService(AccountManager.class);















        final AccountManagerFuture<Bundle> bundle = accountManager.removeAccount(account,















                null, null /* callback */, null /* handler */);















        try {