From 378627c451e684d5f70cc41c1026c481780f8237 Mon Sep 17 00:00:00 2001
From: Nupur Saxena <nupursn@google.com>
Date: Wed, 3 May 2023 13:47:15 +0000
Subject: [PATCH] Add timeout to removeAccount during provisioning

Bug: http://b/279192742

Change-Id: I909bf2f38b9d09addaf768fd86bd3910b0a82d2f
---
 .../server/devicepolicy/DevicePolicyManagerService.java      | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
index 12f8a54c861a6..e2278331f9047 100644
--- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
+++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
@@ -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 {