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

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

Merge "Add timeout to removeAccount during provisioning"

parents c94a6e13 378627c4

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

+2 −3
Original line number Diff line number Diff line
@@ -21763,10 +21763,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 {