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

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

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

parents b98f79e5 4d6eca5b

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 {