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

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

Merge "Add timeout to removeAccount during provisioning" into udc-dev am:... 

Merge "Add timeout to removeAccount during provisioning" into udc-dev am: b75484c0 am: dab5788c am: aa9d75f6

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



Change-Id: Ifdeed57cfb968901ffccd0695bccc3441d552bfe
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a669fe74 aa9d75f6

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

+2 −3
Original line number Diff line number Diff line
@@ -21813,10 +21813,9 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { 
        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 {

            final Bundle result = bundle.getResult();

            final Bundle result = accountManager.removeAccount(account,

                    null, null /* callback */, null /* handler */).getResult(60, TimeUnit.SECONDS);

            if (result.getBoolean(AccountManager.KEY_BOOLEAN_RESULT, /* default */ false)) {

                Slogf.i(LOG_TAG, "Account removed from the primary user.");

            } else {