diff options
author | 2023-01-30 13:55:27 +0000 | |
---|---|---|
committer | 2023-01-30 13:55:27 +0000 | |
commit | 592cc0854517d5d9cc98dfdf89a0b2bcad025727 (patch) | |
tree | 7a3c2c6581d922106a5e43d742d52772b48e049d | |
parent | 0e7f993d774b73178f293cd5a45a2143c29c2d06 (diff) |
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
-rw-r--r-- | services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java index c9c9c551462c..9c64054be37e 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; |