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

Commit 4d6eca5b authored by Nupur Saxena's avatar Nupur Saxena
Browse files

Add timeout to removeAccount during provisioning 

Bug: http://b/279192742

Change-Id: I909bf2f38b9d09addaf768fd86bd3910b0a82d2f
(cherry picked from commit 378627c4)
parent 3a9a83da

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

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