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

Commit c7cd7614 authored by Nupur Saxena's avatar Nupur Saxena Committed by Automerger Merge Worker
Browse files

Merge "Migrate and remove account from calling user in headless mode" into udc-dev am: 3d87229f 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22852739



Change-Id: Ic516dcbfcf6d799feb638f42ad3edc1add977db9
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 1a50cb9f 3d87229f

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

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

        copyAccount(targetUser, sourceUser, accountToMigrate, callerPackage);

        if (!keepAccountMigrated) {

            removeAccount(accountToMigrate);

            removeAccount(accountToMigrate, sourceUserId);

        }

    }










@@ -21657,9 +21657,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 {