From 592cc0854517d5d9cc98dfdf89a0b2bcad025727 Mon Sep 17 00:00:00 2001
From: Jonathan Scott <scottjonathan@google.com>
Date: Mon, 30 Jan 2023 13:55:27 +0000
Subject: [PATCH] Remove blocking call on binder thread to check account
 features.

Until this check is restored it will mean we cannot set test DeviceOwner
on devices which have pre-configured Accounts.

I will follow up with accounts team to find a more performant solution.

Test: atest CtsDevicePolicyTestCases
Bug: 261552303
Change-Id: Icae7b6d2f22c632e6fb7d5223e2e10b0773cea02
---
 .../server/devicepolicy/DevicePolicyManagerService.java       | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
index c9c9c551462c9..9c64054be37e9 100644
--- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
+++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
@@ -16363,7 +16363,9 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {
 
     private boolean hasAccountFeatures(AccountManager am, Account account, String[] features) {
         try {
-            return am.hasFeatures(account, features, null, null).getResult();
+            // TODO(267156507): Restore without blocking binder thread
+            return false;
+//            return am.hasFeatures(account, features, null, null).getResult();
         } catch (Exception e) {
             Slogf.w(LOG_TAG, "Failed to get account feature", e);
             return false;